work suspended message; HTTP header

svn path=/trunk/boinc/; revision=9035
This commit is contained in:
David Anderson 2005-12-05 06:07:52 +00:00
parent db55337219
commit fbf04807b4
3 changed files with 16 additions and 3 deletions

View File

@ -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

View File

@ -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
);
}

View File

@ -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) {