Index: server/views/pifr_server.views_default.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/views/pifr_server.views_default.inc,v retrieving revision 1.18 diff -u -r1.18 pifr_server.views_default.inc --- server/views/pifr_server.views_default.inc 28 Oct 2009 04:44:39 -0000 1.18 +++ server/views/pifr_server.views_default.inc 28 Oct 2009 05:06:17 -0000 @@ -2238,6 +2238,298 @@ 'description' => '', 'weight' => 0, )); + $handler = $view->new_display('page', 'Event log (client)', 'page_5'); + $handler->override_option('arguments', array( + 'client_id' => array( + 'default_action' => 'not found', + 'style_plugin' => 'default_summary', + 'style_options' => array(), + 'wildcard' => 'all', + 'wildcard_substitution' => 'All', + 'title' => '', + 'breadcrumb' => '', + 'default_argument_type' => 'fixed', + 'default_argument' => '', + 'validate_type' => 'none', + 'validate_fail' => 'not found', + 'break_phrase' => 0, + 'not' => 0, + 'id' => 'client_id', + 'table' => 'pifr_client', + 'field' => 'client_id', + 'relationship' => 'client_id', + 'validate_user_argument_type' => 'uid', + 'validate_user_roles' => array( + '2' => 0, + '6' => 0, + '3' => 0, + '5' => 0, + '4' => 0, + ), + 'override' => array( + 'button' => 'Use default', + ), + 'default_options_div_prefix' => '', + 'default_argument_user' => 0, + 'default_argument_fixed' => '', + 'default_argument_php' => '', + 'validate_argument_node_type' => array( + 'forum' => 0, + 'book' => 0, + 'page' => 0, + 'story' => 0, + ), + 'validate_argument_node_access' => 0, + 'validate_argument_nid_type' => 'nid', + 'validate_argument_vocabulary' => array( + '1' => 0, + '2' => 0, + ), + 'validate_argument_type' => 'tid', + 'validate_argument_transform' => 0, + 'validate_user_restrict_roles' => 0, + 'validate_argument_php' => '', + ), + )); + $handler->override_option('title', 'Client review log'); + $handler->override_option('path', 'pifr/log/client/%'); + $handler->override_option('menu', array( + 'type' => 'none', + 'title' => '', + 'description' => '', + 'weight' => '0', + 'name' => 'navigation', + )); + $handler->override_option('tab_options', array( + 'type' => 'none', + 'title' => '', + 'description' => '', + 'weight' => 0, + )); + $handler = $view->new_display('page', 'Event log (client, recent)', 'page_6'); + $handler->override_option('fields', array( + 'client_id' => array( + 'label' => 'Client ID', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'set_precision' => FALSE, + 'precision' => 0, + 'decimal' => '.', + 'separator' => ',', + 'prefix' => '', + 'suffix' => '', + 'exclude' => 1, + 'id' => 'client_id', + 'table' => 'pifr_client', + 'field' => 'client_id', + 'relationship' => 'client_id', + ), + 'log_id' => array( + 'label' => 'ID', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'set_precision' => FALSE, + 'precision' => 0, + 'decimal' => '.', + 'separator' => ',', + 'prefix' => '', + 'suffix' => '', + 'exclude' => 0, + 'id' => 'log_id', + 'table' => 'pifr_log', + 'field' => 'log_id', + 'relationship' => 'none', + ), + 'test_id' => array( + 'label' => 'Test ID', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'set_precision' => FALSE, + 'precision' => 0, + 'decimal' => '.', + 'separator' => ',', + 'prefix' => '', + 'suffix' => '', + 'exclude' => 1, + 'id' => 'test_id', + 'table' => 'pifr_test', + 'field' => 'test_id', + 'relationship' => 'test_id', + ), + 'type' => array( + 'label' => 'Type', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'exclude' => 0, + 'id' => 'type', + 'table' => 'pifr_test', + 'field' => 'type', + 'relationship' => 'test_id', + ), + 'title' => array( + 'label' => 'Title', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 1, + 'path' => 'pifr/test/[test_id]', + 'link_class' => '', + 'alt' => 'View test details.', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'exclude' => 0, + 'id' => 'title', + 'table' => 'pifr_test', + 'field' => 'title', + 'relationship' => 'test_id', + ), + 'code' => array( + 'label' => 'Message', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'set_precision' => FALSE, + 'precision' => 0, + 'decimal' => '.', + 'separator' => ',', + 'prefix' => '', + 'suffix' => '', + 'exclude' => 0, + 'id' => 'code', + 'table' => 'pifr_log', + 'field' => 'code', + 'relationship' => 'none', + ), + 'timestamp' => array( + 'label' => 'Timestamp', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'date_format' => 'time ago', + 'custom_date_format' => '', + 'exclude' => 0, + 'id' => 'timestamp', + 'table' => 'pifr_log', + 'field' => 'timestamp', + 'relationship' => 'none', + 'override' => array( + 'button' => 'Use default', + ), + ), + )); + $handler->override_option('title', 'Recent client review log'); + $handler->override_option('items_per_page', 10); + $handler->override_option('use_pager', '0'); + $handler->override_option('path', 'pifr/log/client/recent/%'); + $handler->override_option('menu', array( + 'type' => 'none', + 'title' => '', + 'description' => '', + 'weight' => 0, + 'name' => 'navigation', + )); + $handler->override_option('tab_options', array( + 'type' => 'none', + 'title' => '', + 'description' => '', + 'weight' => 0, + )); $views[$view->name] = $view; Index: server/pifr_server.test.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.test.inc,v retrieving revision 1.53 diff -u -r1.53 pifr_server.test.inc --- server/pifr_server.test.inc 28 Oct 2009 03:06:30 -0000 1.53 +++ server/pifr_server.test.inc 28 Oct 2009 05:06:16 -0000 @@ -459,6 +459,26 @@ '#value' => l(t('View entire log'), 'pifr/log/' . $test['test_id']) . views_embed_view('pifr_server_log', 'page_4', $test['test_id']), ); + + // If test type is a client and the client test has a result then display a + // log of client review activity. + if ($test['type'] == PIFR_SERVER_TEST_TYPE_CLIENT && $test['status'] == PIFR_SERVER_TEST_STATUS_RESULT) { + $client = pifr_server_client_get_test($test['test_id']); + + $form['client_log'] = array( + '#type' => 'fieldset', + '#title' => t('Client log'), + '#attributes' => array('id' => 'pifr-log'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#weight' => -6.5, + ); + $form['client_log']['table'] = array( + '#type' => 'markup', + '#value' => l(t('View entire log'), 'pifr/log/client/' . $client['client_id']) . + views_embed_view('pifr_server_log', 'page_6', $client['client_id']), + ); + } } /**