diff --git a/checkin_notes b/checkin_notes index 74990e36c4..38bfc00e8f 100755 --- a/checkin_notes +++ b/checkin_notes @@ -14206,3 +14206,13 @@ David 4 Dec 2005 user/ create_account_form.php hosts_user.php + +David 4 Dec 2005 + - Manager: if a result's project is suspended, + show this in work tab + - core client: use full BOINC version # in HTTP request header + + client/ + http_curl.C + clientgui/ + ViewWork.cpp diff --git a/client/http_curl.C b/client/http_curl.C index 60a69bcb4a..0de30d74c4 100644 --- a/client/http_curl.C +++ b/client/http_curl.C @@ -132,8 +132,8 @@ void parse_url(const char* url, char* host, int &port, char* file) { } void get_user_agent_string() { - sprintf(g_user_agent_string, "BOINC client (%s %d.%02d)", - HOSTTYPE, BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION + sprintf(g_user_agent_string, "BOINC client (%s %d.%d.%d)", + HOSTTYPE, BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, BOINC_RELEASE ); } diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 641f202711..34fa9566c0 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -634,7 +634,7 @@ wxInt32 CViewWork::FormatStatus(wxInt32 item, wxString& strBuffer) const { bool bNetworkSuspended = false; CMainDocument* doc = wxGetApp().GetDocument(); RESULT* result = wxGetApp().GetDocument()->result(item); - + PROJECT* project; wxASSERT(doc); wxASSERT(wxDynamicCast(doc, CMainDocument)); @@ -655,8 +655,11 @@ wxInt32 CViewWork::FormatStatus(wxInt32 item, wxString& strBuffer) const { } break; case RESULT_FILES_DOWNLOADED: + project = doc->state.lookup_project(result->project_url); if (result->aborted_via_gui) { strBuffer = _("Aborted by user"); + } else if (project && project->suspended_via_gui) { + strBuffer = _("Project suspended by user"); } else if (result->suspended_via_gui) { strBuffer = _("Suspended by user"); } else if (bActivitiesSuspended) {