Menu
▾
▴
[phpBT-dev] CVS: phpbt include.php,1.34,1.35 query.php,1.21,1.22 user.php,1.11,1.12
|
From: Benjamin C. <bc...@us...> - 2001-08-21 16:43:27
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv25166
Modified Files:
include.php query.php user.php
Log Message:
Selectable columns works!
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- include.php 2001/08/21 14:29:59 1.34
+++ include.php 2001/08/21 16:43:23 1.35
@@ -60,7 +60,7 @@
var $Host = 'localhost';
var $Database = 'BugTracker';
var $User = 'root';
- var $Password = '';
+ var $Password = 'gr8val20';
function grab($q_string = '') {
if ($q_string) $this->query($q_string);
@@ -100,30 +100,21 @@
'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',
+ 'created_date' => 'Created Date',
+ 'lastmodifier' => 'Last Modified By',
+ 'last_modified_date' => 'Last Modified Date',
'project_name' => 'Project',
'version_name' => 'Version',
'component_name' => 'Component',
'os_name' => 'OS',
'browser_string' => 'Browser',
- 'close_date' => 'Closed'
+ 'close_date' => 'Closed Date'
);
-$default_db_fields = array(
- 'bug_id' => 'ID',
- 'title' => 'Title',
- 'reporter' => 'Reporter',
- 'owner' => 'Owner',
- 'severity_name' => 'Severity',
- 'priority' => 'Priority',
- 'status_name' => 'Status',
- 'resolution_name' => 'Resolution'
- );
+$default_db_fields = array('bug_id', 'title', 'reporter', 'owner',
+ 'severity_name', 'priority', 'status_name', 'resolution_name');
class sqlclass extends CT_Sql {
var $database_class = 'dbclass';
@@ -172,6 +163,11 @@
$this->auth['db_fields'] = unserialize($u['bug_list_fields']);
return $u['user_id'];
}
+ }
+
+ function unauth($nobody = false) {
+ Auth::unauth($nobody);
+ $this->auth['db_fields'] = '';
}
}
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- query.php 2001/08/21 14:29:59 1.21
+++ query.php 2001/08/21 16:43:23 1.22
@@ -159,7 +159,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, $auth,
- $default_db_fields;
+ $default_db_fields, $all_db_fields;
$t->set_file('content','buglist.html');
$t->set_block('content','row','rows');
@@ -185,7 +185,7 @@
'project' => build_select('project'),
'TITLE' => $TITLE['buglist']));
- $q->query("select bug.*, reporter.email as reporter, owner.email as owner, severity_name, status_name, version_name, component_name, resolution_name, severity_color from bug left join resolution using (resolution_id), severity, status, version, component left join user owner on bug.assigned_to = owner.user_id left join user reporter on bug.created_by = reporter.user_id where bug.severity_id = severity.severity_id and bug.status_id = status.status_id and bug.version_id = version.version_id and bug.component_id = component.component_id ". ($querystring != '' ? "and $querystring " : ''). "order by $order $sort limit $llimit, $selrange");
+ $q->query("select bug.*, reporter.email as reporter, owner.email as owner, lastmodifier.email as lastmodifier, project_name, severity_name, status_name, os_name, version_name, component_name, resolution_name, severity_color from bug left join resolution using (resolution_id), severity, status, os, version, component, project left join user owner on bug.assigned_to = owner.user_id left join user reporter on bug.created_by = reporter.user_id left join user lastmodifier on bug.last_modified_by = lastmodifier.user_id where bug.severity_id = severity.severity_id and bug.status_id = status.status_id and bug.os_id = os.os_id and bug.version_id = version.version_id and bug.component_id = component.component_id and bug.project_id = project.project_id ". ($querystring != '' ? "and $querystring " : ''). "order by $order $sort limit $llimit, $selrange");
$headers = array(
'bug_id' => 'bug_id',
@@ -197,10 +197,13 @@
'status_name' => 'status.sort_order',
'owner' => 'owner',
'reporter' => 'reporter',
+ 'lastmodifier' => 'last_modifier',
'created_date' => 'created_date',
- 'project_name' => 'project_id',
+ 'last_modified_date' => 'last_modified_date',
+ 'project_name' => 'project_name',
'component_name' => 'component_name',
- 'os_name' => 'os_id',
+ 'version_name' => 'version_name',
+ 'os_name' => 'os_name',
'browser_string' => 'browser_string',
'resolution_name' => 'resolution.sort_order',
'close_date' => 'close_date');
@@ -217,9 +220,9 @@
// Header row
$db_fields = $auth->auth['db_fields'] ? $auth->auth['db_fields'] :
$default_db_fields;
- foreach ($db_fields as $field => $title) {
+ foreach ($db_fields as $field) {
$t->set_var(array(
- 'coldata' => "<a href='{{$field}url}'>$title</a>",
+ 'coldata' => "<a href='{{$field}url}'>{$all_db_fields[$field]}</a>",
'td-extra' => "class=\"header-col\" bgcolor=\"{{$field}color}\""
));
$t->parse('cols', 'col', true);
@@ -232,7 +235,7 @@
while ($row = $q->grab()) {
$bgcolor = USE_SEVERITY_COLOR ? $row['severity_color'] :
((++$i % 2 == 0) ? '#dddddd' : '#ffffff');
- foreach ($db_fields as $field => $title) {
+ foreach ($db_fields as $field) {
switch ($field) {
case 'url' :
$coldata = "<a href='{$row[$field]}'>{$row[$field]}</a>";
@@ -241,7 +244,7 @@
case 'created_date' :
case 'last_modified_date' :
case 'close_date' :
- $coldata = date(DATEFORMAT, $row[$field]);
+ $coldata = $row[$field] ? date(DATEFORMAT, $row[$field]) : ' ';
$td_extra = 'class="center-col"';
break;
case 'bug_id' :
@@ -251,6 +254,7 @@
break;
case 'reporter' :
case 'owner' :
+ case 'lastmodifier' :
$coldata = maskemail($row[$field]);
$td_extra = 'class="center-col"';
break;
Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/user.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- user.php 2001/08/21 14:29:59 1.11
+++ user.php 2001/08/21 16:43:23 1.12
@@ -68,11 +68,14 @@
$my_fields = $auth->auth['db_fields'] ? $auth->auth['db_fields'] :
$default_db_fields;
+ foreach ($my_fields as $field) {
+ $checked[$field] = true;
+ }
foreach ($all_db_fields as $field => $title) {
$t->set_var(array(
'column_name' => $field,
'column_title' => $title,
- 'checked' => $my_fields[$field] ? 'checked' : ''
+ 'checked' => $checked[$field] ? 'checked' : ''
));
$t->parse('list_rows', 'column_list_row', true);
}
|
