Menu
▾
▴
[phpBT-dev] CVS: phpbt bug.php,1.139,1.140 config-dist.php,1.30,1.31 include.php,1.135,1.136 install.php,1.48,1.49 query.php,1.101,1.102
|
From: Ulf E. <ulf...@us...> - 2005-08-22 19:44:58
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7041 Modified Files: bug.php config-dist.php include.php install.php query.php Log Message: RFE #759250 - Table Driven Priorities. Index: bug.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/bug.php,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- bug.php 20 Jul 2005 18:12:25 -0000 1.139 +++ bug.php 22 Aug 2005 19:44:46 -0000 1.140 @@ -120,7 +120,7 @@ $template_ext = false/*HTML_EMAIL*/ ? 'html' : 'txt'; $template = $newbug ? "bugemail-newbug.$template_ext" : "bugemail.$template_ext"; - foreach(array('title','url','priority') as $field) { + foreach(array('title','url') as $field) { if (isset($cf[$field])) { $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($field), $db->quote(stripslashes($buginfo[$field])), $db->quote(stripslashes($cf[$field])), $u, $now)).")"); $t->assign(array( @@ -143,6 +143,7 @@ 'resolution' => TBL_RESOLUTION, 'database' => TBL_DATABASE, 'severity' => TBL_SEVERITY, + 'priority' => TBL_PRIORITY, 'os' => TBL_OS, 'version' => TBL_VERSION, 'database' => TBL_DATABASE, @@ -280,9 +281,6 @@ 'bugid' => $buginfo['bug_id'], 'siteroot' => INSTALL_URL, 'bugurl' => INSTALL_URL."/bug.php?op=show&bugid={$buginfo['bug_id']}", - 'priority' => $select['priority'][(!empty($cf['priority']) - ? $cf['priority'] : $buginfo['priority'])], - 'priority_stat' => !empty($cf['priority']) ? '!' : ' ', 'reporter' => $reporter, 'reporter_stat' => $reporterstat, 'assignedto' => $assignedto, Index: config-dist.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- config-dist.php 4 Jun 2005 21:48:26 -0000 1.30 +++ config-dist.php 22 Aug 2005 19:44:46 -0000 1.31 @@ -54,6 +54,7 @@ define ('TBL_RESOLUTION', TBL_PREFIX.'resolution'); define ('TBL_SAVED_QUERY', TBL_PREFIX.'saved_query'); define ('TBL_SEVERITY', TBL_PREFIX.'severity'); +define ('TBL_PRIORITY', TBL_PREFIX.'priority'); define ('TBL_STATUS', TBL_PREFIX.'status'); define ('TBL_USER_GROUP', TBL_PREFIX.'user_group'); define ('TBL_USER_PERM', TBL_PREFIX.'user_perm'); Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- include.php 20 Jul 2005 18:19:54 -0000 1.135 +++ include.php 22 Aug 2005 19:44:46 -0000 1.136 @@ -22,6 +22,8 @@ // ------------------------------------------------------------------------ // $Id$ +define('RAWERROR', true); + define('PHPBT_VERSION', '1.0rc6'); @ini_set("magic_quotes_runtime", 0); @ini_set("magic_quotes_sybase", 0); @@ -90,7 +92,7 @@ 'description' => 'Description', 'url' => 'URL', 'severity_name' => 'Severity', - 'priority' => 'Priority', + 'priority_name' => 'Priority', 'status_name' => 'Status', 'resolution_name' => 'Resolution', 'closed_in_version_name' => 'Closed in Version', @@ -111,7 +113,7 @@ ); $default_db_fields = array('bug_id', 'title', 'reporter', 'owner', - 'severity_name', 'priority', 'status_name', 'resolution_name'); + 'severity_name', 'priority_name', 'status_name', 'resolution_name'); // Template class Index: install.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/install.php,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- install.php 20 Jul 2005 18:19:54 -0000 1.48 +++ install.php 22 Aug 2005 19:44:46 -0000 1.49 @@ -116,6 +116,7 @@ '/TBL_RESOLUTION/' => $_POST['tbl_prefix'].'resolution', '/TBL_SAVED_QUERY/' => $_POST['tbl_prefix'].'saved_query', '/TBL_SEVERITY/' => $_POST['tbl_prefix'].'severity', + '/TBL_PRIORITY/' => $_POST['tbl_prefix'].'priority', '/TBL_STATUS/' => $_POST['tbl_prefix'].'status', '/TBL_USER_GROUP/' => $_POST['tbl_prefix'].'user_group', '/TBL_USER_PERM/' => $_POST['tbl_prefix'].'user_perm', Index: query.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/query.php,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- query.php 4 Jun 2005 16:11:16 -0000 1.101 +++ query.php 22 Aug 2005 19:44:46 -0000 1.102 @@ -196,8 +196,6 @@ return ($colvalue ? date(DATE_FORMAT, $colvalue) : ''); case 'lastmodifier' : return (!empty($colvalue) ? maskemail($colvalue) : ''); - case 'priority' : - return $select['priority'][$colvalue]; case 'reporter' : case 'owner' : case 'lastmodifier' : @@ -232,9 +230,6 @@ return '<div align="center">'. (!empty($colvalue) ? maskemail($colvalue) : '').'</div>'; break; - case 'priority' : - return '<div align="center">'.$select['priority'][$colvalue].'</div>'; - break; default : return '<div align="center">'. (!empty($colvalue) ? $colvalue : '').'</div>'; @@ -251,7 +246,7 @@ 'description' => 'description', 'url' => 'url', 'severity_name' => 'severity.severity_name', - 'priority' => 'priority', + 'priority_name' => 'priority.priority_name', 'status_name' => 'status.status_name', 'resolution_name' => 'resolution_name', 'reporter' => 'reporter.login as reporter', @@ -277,7 +272,7 @@ 'description' => 'description', 'url' => 'url', 'severity_name' => 'severity.sort_order', - 'priority' => 'b.priority', + 'priority_name' => 'priority.sort_order', 'status_name' => 'status.sort_order', 'owner' => 'owner', 'reporter' => 'reporter.login', @@ -338,7 +333,8 @@ $desired_fields = !empty($_SESSION['db_fields']) ? $_SESSION['db_fields'] : $default_db_fields; - $query_fields = array('bug_id as bug_link_id', 'severity.severity_color'); + $query_fields = array('bug_id as bug_link_id', + 'severity.severity_color', 'priority.priority_color'); foreach ($desired_fields as $field) { $query_fields[] = $query_db_fields[$field]; $field_titles[] = $all_db_fields[$field]; |
