|
From: Benjamin C. <bc...@us...> - 2001-08-20 23:16:53
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv19463
Modified Files:
include.php query.php user.php
Log Message:
Getting closer on theuser bug list column preferences
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- include.php 2001/08/18 20:11:52 1.32
+++ include.php 2001/08/20 23:16:50 1.33
@@ -91,6 +91,40 @@
15 => 'Administrator'
);
+$all_db_fields = array(
+ 'bug_id' => 'ID',
+ 'title' => 'Title',
+ 'description' => 'Description',
+ 'url' => 'URL',
+ 'severity_name' => 'Severity',
+ 'priority' => 'Priority',
+ 'status_name' => 'Status',
+ 'resolution_name' => 'Resolution',
+ 'assigned_to' => 'Assigned To',
+ 'reporter' => 'Reporter',
+ 'owner' => 'Owner',
+ 'created_date' => 'Created',
+ 'last_modified_by' => 'Last Modified',
+ 'last_modified_date' => 'Last Modified By',
+ 'project_name' => 'Project',
+ 'version_name' => 'Version',
+ 'component_name' => 'Component',
+ 'os_name' => 'OS',
+ 'browser_string' => 'Browser',
+ 'close_date' => 'Closed'
+ );
+
+$default_db_fields = array(
+ 'bug_id' => 'ID',
+ 'title' => 'Title',
+ 'reporter' => 'Reporter',
+ 'owner' => 'Owner',
+ 'severity_name' => 'Severity',
+ 'priority' => 'Priority',
+ 'status_name' => 'Status',
+ 'resolution_name' => 'Resolution'
+ );
+
class sqlclass extends CT_Sql {
var $database_class = 'dbclass';
var $database_table = 'active_sessions';
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- query.php 2001/08/20 22:30:39 1.19
+++ query.php 2001/08/20 23:16:50 1.20
@@ -23,39 +23,6 @@
include 'include.php';
-$dbfields = array(
- 'bug_id' => 'ID',
- 'title' => 'Title',
- 'description' => 'Description',
- 'url' => 'URL',
- 'severity_name' => 'Severity',
- 'priority' => 'Priority',
- 'status_name' => 'Status',
- 'resolution_name' => 'Resolution',
- 'assigned_to' => 'Assigned To',
- 'reporter' => 'Reporter',
- 'owner' => 'Owner',
- 'created_date' => 'Created',
- 'last_modified_by' => 'Last Modified',
- 'last_modified_date' => 'Last Modified By',
- 'project_name' => 'Project',
- 'version_name' => 'Version',
- 'component_name' => 'Component',
- 'os_name' => 'OS',
- 'browser_string' => 'Browser',
- 'close_date' => 'Closed'
- );
-$mydbfields = array(
- 'bug_id' => 'ID',
- 'title' => 'Title',
- 'reporter' => 'Reporter',
- 'owner' => 'Owner',
- 'severity_name' => 'Severity',
- 'priority' => 'Priority',
- 'status_name' => 'Status',
- 'resolution_name' => 'Resolution'
- );
-
function delete_saved_query($queryid) {
global $q, $u, $me;
@@ -191,7 +158,7 @@
function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
global $querystring, $me, $q, $t, $selrange, $order, $sort, $query,
- $page, $op, $select, $TITLE, $STRING, $savedqueryname, $u, $mydbfields;
+ $page, $op, $select, $TITLE, $STRING, $savedqueryname, $u, $default_db_fields;
$t->set_file('content','buglist.html');
$t->set_block('content','row','rows');
@@ -247,7 +214,7 @@
}
// Header row
- foreach ($mydbfields as $field => $title) {
+ foreach ($default_db_fields as $field => $title) {
$t->set_var(array(
'coldata' => "<a href='{{$field}url}'>$title</a>",
'td-extra' => "class=\"header-col\" bgcolor=\"{{$field}color}\""
@@ -262,7 +229,7 @@
while ($row = $q->grab()) {
$bgcolor = USE_SEVERITY_COLOR ? $row['severity_color'] :
((++$i % 2 == 0) ? '#dddddd' : '#ffffff');
- foreach ($mydbfields as $field => $title) {
+ foreach ($default_db_fields as $field => $title) {
switch ($field) {
case 'url' :
$coldata = "<a href='{$row[$field]}'>{$row[$field]}</a>";
@@ -303,7 +270,7 @@
$t->parse('rows','row',true);
$t->set_var('cols', '');
}
- $t->set_var('numcols', count($mydbfields));
+ $t->set_var('numcols', count($default_db_fields));
}
$t->set_file('wrap','wrap.html');
Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/user.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- user.php 2001/08/20 22:56:30 1.9
+++ user.php 2001/08/20 23:16:50 1.10
@@ -53,15 +53,27 @@
}
function show_preferences_form($error = '') {
- global $t, $pass1, $pass2;
+ global $t, $pass1, $pass2, $all_db_fields, $default_db_fields, $auth;
$t->set_file('content', 'user.html');
+ $t->set_block('content', 'column_list_row', 'list_rows');
+
$t->set_var(array(
'error' => $error ? $error.'<br><br>' : '',
'pass1' => $pass1,
'pass2' => $pass2
));
-
+
+ $my_fields = $auth->auth['db_fields'] ? $auth->auth['db_fields'] :
+ $default_db_fields;
+ foreach ($all_db_fields as $field => $title) {
+ $t->set_var(array(
+ 'column_name' => $field,
+ 'column_title' => $title,
+ 'checked' => $my_fields[$field] ? 'checked' : ''
+ ));
+ $t->parse('list_rows', 'column_list_row', true);
+ }
}
$t->set_file('wrap', 'wrap.html');
@@ -71,6 +83,7 @@
case 'changepassword' : change_password($_gv['pass1'], $_gv['pass2']); break;
case 'changecolumnlist' : change_bug_list_columns($_gv['column_list']); break;
default : show_preferences_form();
+}
else show_preferences_form();
$t->pparse('main', array('content', 'wrap', 'main'));
|