Menu
▾
▴
phpbt-dev — Developer's mailing list and cvs commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(34) |
Aug
(215) |
Sep
(180) |
Oct
(135) |
Nov
(105) |
Dec
(81) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(76) |
Feb
(22) |
Mar
(154) |
Apr
(149) |
May
(128) |
Jun
(94) |
Jul
(14) |
Aug
(24) |
Sep
(77) |
Oct
(52) |
Nov
(22) |
Dec
(6) |
| 2003 |
Jan
(4) |
Feb
(10) |
Mar
(6) |
Apr
(29) |
May
(10) |
Jun
(37) |
Jul
(39) |
Aug
(13) |
Sep
(23) |
Oct
(3) |
Nov
(7) |
Dec
(2) |
| 2004 |
Jan
|
Feb
(10) |
Mar
(4) |
Apr
|
May
(35) |
Jun
(4) |
Jul
(17) |
Aug
(6) |
Sep
(14) |
Oct
(18) |
Nov
(2) |
Dec
(14) |
| 2005 |
Jan
(9) |
Feb
(30) |
Mar
(6) |
Apr
|
May
(38) |
Jun
(23) |
Jul
(21) |
Aug
(76) |
Sep
(50) |
Oct
(51) |
Nov
(13) |
Dec
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 15:07:14
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv22200/phpbt
Modified Files:
query.php
Log Message:
Updated for DB and SITE TRACKING in advanced query.
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- query.php 13 Jun 2002 14:26:34 -0000 1.79
+++ query.php 13 Jun 2002 15:07:10 -0000 1.80
@@ -75,18 +75,30 @@
$flags = array();
// Need to check $array[0] for Opera --
// it passes non-empty arrays for every multi-choice select box
- if (!empty($status) and $status[0])
+ if (!empty($status) and $status[0]) {
$flags[] = 'b.status_id in ('.delimit_list(',',$status).')';
- if (!empty($resolution) and $resolution[0])
+ }
+ if (!empty($resolution) and $resolution[0]) {
$flags[] = 'b.resolution_id in ('.delimit_list(',',$resolution).')';
- if (!empty($os) and $os[0])
+ }
+ if (!empty($os) and $os[0]) {
$flags[] = 'b.os_id in ('.delimit_list(',',$os).')';
- if (!empty($priority) and $priority[0])
+ }
+ if (!empty($priority) and $priority[0]) {
$flags[] = 'b.priority in ('.delimit_list(',',$priority).')';
- if (!empty($severity) and $severity[0])
+ }
+ if (!empty($severity) and $severity[0]) {
$flags[] = 'b.severity_id in ('.delimit_list(',',$severity).')';
- if (!empty($flags))
+ }
+ if (!empty($database) and $database[0]) {
+ $flags[] = 'b.database_id in ('.delimit_list(',',$database).')';
+ }
+ if (!empty($site) and $site[0]) {
+ $flags[] = 'b.site_id in ('.delimit_list(',',$site).')';
+ }
+ if (!empty($flags)) {
$query[] = '('.delimit_list(' or ',$flags).')';
+ }
// Email field(s)
if (!empty($email1)) {
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:27:10
|
Update of /cvsroot/phpbt/phpbt/languages
In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt/languages
Modified Files:
cz.php cz_iso-8859-2.php en.php
Log Message:
SITE TRACKING and localization of query templates.
Index: cz.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/cz.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cz.php 13 Jun 2002 09:09:14 -0000 1.11
+++ cz.php 13 Jun 2002 14:26:36 -0000 1.12
@@ -84,8 +84,48 @@
'description' => 'Popis',
'sortorder' => 'Poøadí tøídìní',
'suredeletedb' => 'Opravdu chcete odstranit tuto databázi?',
+ 'suredeletesite' => 'Opravdu chcete odstranit toto prostøedí?',
'delete' => 'Odstranit',
- 'version' => 'Verze'
+ 'version' => 'Verze',
+ 'addnewsite' => 'Pøidat nové prostøedí',
+ 'sitelist' => 'Seznam prostøedí',
+ 'sites' => 'Prostøedí',
+ '_opt_All' => 'Ve',
+ '_Project' => 'Projekt',
+ '_Version' => 'Verze',
+ '_Component' => 'Komponenta',
+ '_Status' => 'Status',
+ '_Resolution' => 'Rozhodnutí',
+ '_OpSys' => 'Operaèní systém',
+ '_Priority' => 'Priorita',
+ '_Severity' => 'Dùleitost',
+ '_Database' => 'Databáze',
+ '_ReportedOnSite' => 'Prostøedí výskytu',
+ '_Summary' => 'Shrnutí',
+ '_DescriptionEntry' => 'Poloka popisu',
+ '_SortBy' => 'Tøídit podle',
+ '_SortBy_BugNumber' => 'Èísla BUGu',
+ '_SortBy_Severity' => 'Dùleitosti',
+ '_SortBy_Reporter' => 'Reportéra',
+ '_SortBy_Priority' => 'Priority',
+ '_SortBy_Status' => 'Statutu',
+ '_SortAsc' => 'Vzestupnì',
+ '_SortDesc' => 'Sestupnì',
+ '_SaveThisQueryAs' => 'Uloit tento dotaz jako',
+ '_ResetBackToDefaultQuery' => 'Zpìt k pùvodnímu dotazu',
+ '_SubmitQuery' => 'Odeslat dotaz',
+ '_SavedQueries' => 'Uloené dotazy',
+ '_1GoToThe' => 'Pøejít na',
+ '_1AdvancedQueryPage' => 'stránku pokroèilého vyhledávání',
+ '_1SimpleQueryPage' => 'stránku jednoduchého vyhledávání',
+ '_SureDeleteSavedQuery' => 'Jste si jisti, e chcete odstranit tento uloený dotaz?',
+ '_MatchingAs' => 'odpovídá (vyhledat jako)',
+ '_MatchingAs_Regexp' => 'regulárním výrazem',
+ '_MatchingAs_NotRegexp' => 'není regulárním výrazem',
+ '_MatchingAs_Substring' => 'podøetìzec',
+ '_MatchingAs_Exact' => 'pøesnì',
+ '_eMail_Reporter' => 'reportér',
+ '_eMail_AssignedTo' => 'pøiøazeno',
);
// Page titles
@@ -101,6 +141,8 @@
'editproject' => 'Editovat projekt',
'addversion' => 'Pøidat verzi',
'editversion' => 'Upravit verzi',
+ 'addsite' => 'Pøidat prostøedí',
+ 'editsite' => 'Upravit prostøedí',
'project' => 'Projekty',
'os' => 'Operaèní systémy',
'resolution' => 'Rozhodnutí',
@@ -134,27 +176,8 @@
'adddatabase' => 'Pøidat databázi',
'editdatabase' => 'Upravit databázi',
'database' => 'Databáze',
- 'documentation' => 'Dokumentace',
- '_opt_All' => 'Ve',
- '_Project' => 'Projekt',
- '_Version' => 'Verze',
- '_Component' => 'Komponenta',
- '_Status' => 'Status',
- '_SortBy' => 'Tøídit podle',
- '_SortBy_BugNumber' => 'Èísla BUGu',
- '_SortBy_Severity' => 'Dùleitosti',
- '_SortBy_Reporter' => 'Reportéra',
- '_SortBy_Priority' => 'Priority',
- '_SortBy_Status' => 'Statutu',
- '_SortAsc' => 'Vzestupnì',
- '_SortDesc' => 'Sestupnì',
- '_SaveThisQueryAs' => 'Uloit tento dotaz jako',
- '_ResetBackToDefaultQuery' => 'Zpìt k pùvodnímu dotazu',
- '_SubmitQuery' => 'Odeslat dotaz',
- '_SavedQueries' => 'Uloené dotazy',
- '_1GoToThe' => 'Pøejít na',
- '_1AdvancedQueryPage' => 'stránku pokroèilého vyhledávání',
- '_SureDeleteSavedQuery' => 'Jste si jisti, e chcete odstranit tento uloený dotaz?'
+ 'site' => 'Prostøedí',
+ 'documentation' => 'Dokumentace'
);
?>
Index: cz_iso-8859-2.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/cz_iso-8859-2.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cz_iso-8859-2.php 13 Jun 2002 09:09:14 -0000 1.8
+++ cz_iso-8859-2.php 13 Jun 2002 14:26:37 -0000 1.9
@@ -84,9 +84,49 @@
'description' => 'Popis',
'sortorder' => 'Poøadí tøídìní',
'suredeletedb' => 'Opravdu chcete odstranit tuto databázi?',
+ 'suredeletesite' => 'Opravdu chcete odstranit toto prostøedí?',
'delete' => 'Odstranit',
- 'version' => 'Verze'
- );
+ 'version' => 'Verze',
+ 'addnewsite' => 'Pøidat nové prostøedí',
+ 'sitelist' => 'Seznam prostøedí',
+ 'sites' => 'Prostøedí',
+ '_opt_All' => 'V¹e',
+ '_Project' => 'Projekt',
+ '_Version' => 'Verze',
+ '_Component' => 'Komponenta',
+ '_Status' => 'Status',
+ '_Resolution' => 'Rozhodnutí',
+ '_OpSys' => 'Operaèní systém',
+ '_Priority' => 'Priorita',
+ '_Severity' => 'Dùle¾itost',
+ '_Database' => 'Databáze',
+ '_ReportedOnSite' => 'Prostøedí výskytu',
+ '_Summary' => 'Shrnutí',
+ '_DescriptionEntry' => 'Polo¾ka popisu',
+ '_SortBy' => 'Tøídit podle',
+ '_SortBy_BugNumber' => 'Èísla BUGu',
+ '_SortBy_Severity' => 'Dùle¾itosti',
+ '_SortBy_Reporter' => 'Reportéra',
+ '_SortBy_Status' => 'Statutu',
+ '_SortBy_Priority' => 'Priority',
+ '_SortAsc' => 'Vzestupnì',
+ '_SortDesc' => 'Sestupnì',
+ '_SaveThisQueryAs' => 'Ulo¾t tento dotaz jako',
+ '_ResetBackToDefaultQuery' => 'Zpìt k pùvodnímu dotazu',
+ '_SubmitQuery' => 'Odeslat dotaz',
+ '_SavedQueries' => 'Ulo¾ené dotazy',
+ '_1GoToThe' => 'Pøejít na',
+ '_1AdvancedQueryPage' => 'stránku pokroèilého vyhledávání',
+ '_1SimpleQueryPage' => 'stránku jednoduchého vyhledávání',
+ '_SureDeleteSavedQuery' => 'Jste si jisti, ¾e chcete smazat tento ulo¾ený dotaz?',
+ '_MatchingAs' => 'odpovídá (vyhledat jako)',
+ '_MatchingAs_Regexp' => 'regulárním výrazem',
+ '_MatchingAs_NotRegexp' => 'není regulárním výrazem',
+ '_MatchingAs_Substring' => 'podøetìzec',
+ '_MatchingAs_Exact' => 'pøesnì',
+ '_eMail_Reporter' => 'reportér',
+ '_eMail_AssignedTo' => 'pøiøazeno'
+ );
// Page titles
$TITLE = array(
@@ -101,6 +141,8 @@
'editproject' => 'Editovat projekt',
'addversion' => 'Pøidat verzi',
'editversion' => 'Upravit verzi',
+ 'addsite' => 'Pøidat prostøedí',
+ 'editsite' => 'Upravit prostøedí',
'project' => 'Projekty',
'os' => 'Operaèní systémy',
'resolution' => 'Rozhodnutí',
@@ -135,25 +177,6 @@
'editdatabase' => 'Upravit databázi',
'database' => 'Databáze',
'documentation' => 'Dokumentace',
- '_opt_All' => 'V¹e',
- '_Project' => 'Projekt',
- '_Version' => 'Verze',
- '_Component' => 'Komponenta',
- '_Status' => 'Status',
- '_SortBy' => 'Tøídit podle',
- '_SortBy_BugNumber' => 'Èísla BUGu',
- '_SortBy_Severity' => 'Dùle¾itosti',
- '_SortBy_Reporter' => 'Reportéra',
- '_SortBy_Status' => 'Statutu',
- '_SortBy_Priority' => 'Priority',
- '_SortAsc' => 'Vzestupnì',
- '_SortDesc' => 'Sestupnì',
- '_SaveThisQueryAs' => 'Ulo¾t tento dotaz jako',
- '_ResetBackToDefaultQuery' => 'Zpìt k pùvodnímu dotazu',
- '_SubmitQuery' => 'Odeslat dotaz',
- '_SavedQueries' => 'Ulo¾ené dotazy',
- '_1GoToThe' => 'Pøejít na',
- '_1AdvancedQueryPage' => 'stránku pokroèilého vyhledávání',
- '_SureDeleteSavedQuery' => 'Jste si jisti, ¾e chcete smazat tento ulo¾ený dotaz?'
+ 'site' => 'Prostøedí'
);
?>
Index: en.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/en.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- en.php 13 Jun 2002 09:09:14 -0000 1.20
+++ en.php 13 Jun 2002 14:26:37 -0000 1.21
@@ -84,8 +84,48 @@
'description' => 'Description',
'sortorder' => 'Sort order',
'suredeletedb' => 'Are you sure to delete this database?',
+ 'suredeletesite' => 'Are you sure to delete this site?',
'delete' => 'Delete',
- 'version' => 'Version'
+ 'version' => 'Version',
+ 'addnewsite' => 'Add new Site',
+ 'sitelist' => 'Site list',
+ 'sites' => 'Sites',
+ '_opt_All' => 'All',
+ '_Project' => 'Project',
+ '_Version' => 'Version',
+ '_Component' => 'Component',
+ '_Status' => 'Status',
+ '_Resolution' => 'Resolution',
+ '_OpSys' => 'OpSys',
+ '_Priority' => 'Priority',
+ '_Severity' => 'Severity',
+ '_Database' => 'Database',
+ '_ReportedOnSite' => 'Reported on Site',
+ '_Summary' => 'Summary',
+ '_DescriptionEntry' => 'A description entry',
+ '_SortBy' => 'Sort By',
+ '_SortBy_BugNumber' => 'Bug Number',
+ '_SortBy_Severity' => 'Severity',
+ '_SortBy_Reporter' => 'Reporter',
+ '_SortBy_Priority' => 'Priority',
+ '_SortBy_Status' => 'Status',
+ '_SortAsc' => 'Ascending',
+ '_SortDesc' => 'Descending',
+ '_SaveThisQueryAs' => 'Save this query as',
+ '_ResetBackToDefaultQuery' => 'Reset back to default query',
+ '_SubmitQuery' => 'Submit query',
+ '_SavedQueries' => 'Saved Queries',
+ '_1GoToThe' => 'Go to the',
+ '_1AdvancedQueryPage' => 'advanced query page',
+ '_1SimpleQueryPage' => 'simple query page',
+ '_SureDeleteSavedQuery' => 'Are you sure to delete this saved query?',
+ '_MatchingAs' => 'matching as',
+ '_MatchingAs_Regexp' => 'regexp',
+ '_MatchingAs_NotRegexp' => 'not regexp',
+ '_MatchingAs_Substring' => 'substring',
+ '_MatchingAs_Exact' => 'exact',
+ '_eMail_Reporter' => 'Reporter',
+ '_eMail_AssignedTo' => 'Assigned To'
);
// Page titles
@@ -101,6 +141,8 @@
'editproject' => 'Edit Project',
'addversion' => 'Add Version',
'editversion' => 'Edit Version',
+ 'addsite' => 'Add Site',
+ 'editsite' => 'Edit Site',
'project' => 'Projects',
'os' => 'Operating Systems',
'resolution' => 'Resolutions',
@@ -134,26 +176,7 @@
'adddatabase' => 'Add Database',
'editdatabase' => 'Edit Database',
'database' => 'Databases',
- 'documentation' => 'Read documentation',
- '_opt_All' => 'All',
- '_Project' => 'Project',
- '_Version' => 'Version',
- '_Component' => 'Component',
- '_Status' => 'Status',
- '_SortBy' => 'Sort By',
- '_SortBy_BugNumber' => 'Bug Number',
- '_SortBy_Severity' => 'Severity',
- '_SortBy_Reporter' => 'Reporter',
- '_SortBy_Priority' => 'Priority',
- '_SortBy_Status' => 'Status',
- '_SortAsc' => 'Ascending',
- '_SortDesc' => 'Descending',
- '_SaveThisQueryAs' => 'Save this query as',
- '_ResetBackToDefaultQuery' => 'Reset back to default query',
- '_SubmitQuery' => 'Submit query',
- '_SavedQueries' => 'Saved Queries',
- '_1GoToThe' => 'Go to the',
- '_1AdvancedQueryPage' => 'Advanced query page',
- '_SureDeleteSavedQuery' => 'Are you sure to delete this saved query?'
+ 'site' => 'Sites',
+ 'documentation' => 'Read documentation'
);
?>
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:27:09
|
Update of /cvsroot/phpbt/phpbt/inc/db In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt/inc/db Modified Files: mysql.php Log Message: SITE TRACKING and localization of query templates. Index: mysql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mysql.php 30 May 2002 15:04:22 -0000 1.8 +++ mysql.php 13 Jun 2002 14:26:36 -0000 1.9 @@ -35,6 +35,10 @@ 'from '.TBL_DATABASE. ' d left join '.TBL_BUG.' using (database_id) '. 'group by d.database_id, database_name, database_version, sort_order '. 'order by %s %s', + 'admin-list-sites' => 'select s.site_id, site_name, sort_order, '. + 'count(bug_id) as bug_count from '.TBL_SITE. ' s left join '. + TBL_BUG.' using (site_id) group by s.site_id, site_name, sort_order '. + 'order by %s %s', 'admin-list-statuses' => 'select s.status_id, status_name, status_desc, '. 'sort_order, count(bug_id) as bug_count '. 'from '.TBL_STATUS.' s left join '. TBL_BUG.' using (status_id) '. @@ -130,11 +134,11 @@ 'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '. 'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '. 'left join '.TBL_VERSION.' version3 on b.closed_in_version_id = version3.version_id, '. - TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '. + TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.TBL_SITE.' site, '. TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.TBL_PROJECT.' project '. 'where b.severity_id = severity.severity_id '. 'and b.status_id = status.status_id and b.os_id = os.os_id '. - 'and b.version_id = version.version_id '. + 'and b.site_id = site.site_id and b.version_id = version.version_id '. 'and b.component_id = component.component_id '. 'and b.project_id = project.project_id %s '. 'order by %s %s, bug_id asc', |
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:27:09
|
Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt/inc
Modified Files:
functions.php
Log Message:
SITE TRACKING and localization of query templates.
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- functions.php 12 Jun 2002 12:43:49 -0000 1.31
+++ functions.php 13 Jun 2002 14:26:36 -0000 1.32
@@ -45,190 +45,213 @@
///
/// Build a select box with the item matching $value selected
function build_select($params) {
- global $db, $select, $perm, $STRING, $restricted_projects, $QUERY;
+ global $db, $select, $perm, $STRING, $restricted_projects, $QUERY;
- extract($params);
- if (!isset($selected)) $selected = '';
+ extract($params);
+ if (!isset($selected)) {
+ $selected = '';
+ }
- //create hash to map tablenames
- $cfgDatabase = array(
- 'group' => TBL_AUTH_GROUP,
- 'project' => TBL_PROJECT,
- 'component' => TBL_COMPONENT,
- 'status' => TBL_STATUS,
- 'resolution' => TBL_RESOLUTION,
- 'severity' => TBL_SEVERITY,
- 'version' => TBL_VERSION,
- 'database' => TBL_DATABASE,
- );
+ // create hash to map tablenames
+ $cfgDatabase = array(
+ 'group' => TBL_AUTH_GROUP,
+ 'project' => TBL_PROJECT,
+ 'component' => TBL_COMPONENT,
+ 'status' => TBL_STATUS,
+ 'resolution' => TBL_RESOLUTION,
+ 'severity' => TBL_SEVERITY,
+ 'version' => TBL_VERSION,
+ 'database' => TBL_DATABASE,
+ 'site' => TBL_SITE
+ );
- $text = '';
- if (isset($cfgDatabase[$box])) {
- $querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
- $querymid = ' where sort_order > 0 order by sort_order';
- $queries = array(
- 'group' => $querystart.' where group_name <> \'User\' order by group_name',
- 'severity' => $querystart.$querymid,
- 'status' => $querystart.$querymid,
- 'resolution' => $querystart.$querymid,
- 'project' => $perm->have_perm('Admin')
- ? $querystart." where ".
- ($selected ? "(active > 0 or project_id in ($selected))" : 'active > 0').
- " order by {$box}_name"
- : $querystart." where project_id not in ($restricted_projects)".
- " and ".
- ($selected ? " (active > 0 or project_id in ($selected))" : 'active > 0').
- " order by {$box}_name",
- 'component' => $querystart." where project_id = $project and active = 1 order by {$box}_name",
- 'version' => $querystart." where project_id = $project and active = 1 order by {$box}_id desc",
- 'database' => "select {$box}_id, {$box}_name, {$box}_version from $cfgDatabase[$box]".$querymid
- );
- }
+ $text = '';
- switch($box) {
- case 'user_filter' :
- foreach ($STRING['user_filter'] as $k => $v) {
- $text .= sprintf("<option value=\"%d\"%s>%s</option>",
- $k, ($k == $selected ? ' selected' : ''), $v);
- }
- break;
- case 'group' :
- if ($project) { // If we are building for project admin page
- if (!count($selected) or (count($selected) && in_array(0, $selected))) {
- $sel = ' selected';
- } else {
- $sel = '';
- }
- $text = "<option value=\"all\"$sel>All Groups</option>";
- }
- $rs = $db->query($queries[$box]);
- while ($rs->fetchInto($row)) {
- if (count($selected) && in_array($row[$box.'_id'], $selected)) $sel = ' selected';
- else $sel = '';
- $text .= '<option value="'.
- $row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
- }
- break;
- case 'severity' :
- case 'status' :
- case 'resolution' :
- case 'project' :
- case 'component' :
- case 'version' :
- $rs = $db->query($queries[$box]);
- while ($rs->fetchInto($row)) {
- if ($selected == $row[$box.'_id'] and $selected != '') $sel = ' selected';
- else $sel = '';
- $text .= '<option value="'.
- $row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
- }
- break;
- case 'database' :
- $text = '<option value="0">None</option>';
- $rs = $db->query($queries[$box]);
- while ($rs->fetchInto($row)) {
- if ($selected == $row[$box.'_id'] and $selected != '') $sel = ' selected';
- else $sel = '';
- $text .= '<option value="'.
- $row[$box.'_id'].'"'.$sel.'>'.$row[$box.'_name'].' '.$row[$box.'_version'].'</option>';
- }
- break;
- case 'os' :
- $rs = $db->query("select {$box}_id, {$box}_name, regex from ".TBL_OS." where sort_order > 0 order by sort_order");
- while ($rs->fetchInto($row)) {
- if ($selected == '' and isset($row['Regex']) and
- preg_match($row['Regex'],$GLOBALS['HTTP_USER_AGENT'])) $sel = ' selected';
- elseif ($selected == $row[$box.'_id']) $sel = ' selected';
- else $sel = '';
- $text .= '<option value="'.
- $row[$box.'_id']."\"$sel>".$row[$box.'_name']."</option>";
- }
- break;
- case 'owner' :
- $rs = $db->query("select u.user_id, login from ".TBL_AUTH_USER." u, ".TBL_USER_GROUP." ug, ".TBL_AUTH_GROUP." g where u.active > 0 and u.user_id = ug.user_id and ug.group_id = g.group_id and group_name = 'Developer' order by login");
- while ($rs->fetchInto($row)) {
- if ($selected == $row['user_id']) $sel = ' selected';
- else $sel = '';
- $text .= "<option value=\"{$row['user_id']}\"$sel>{$row['login']}</option>";
- }
- break;
- case 'bug_cc' :
- $rs = $db->query(sprintf($QUERY['functions-bug-cc'], $selected));
- while (list($uid, $user) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
- $text .= "<option value=\"$uid\">".maskemail($user).'</option>';
- }
-
- // Pad the sucker
- $text .= '<option value="" disabled>';
- for ($i = 0; $i < 30; $i++) {
- $text .= ' ';
- }
- $text .= '</option>';
- break;
- case 'LANGUAGE' :
- $dir = opendir('languages');
- while (false !== ($file = readdir($dir))) {
- if ($file != '.' && $file != '..' && $file != 'CVS') {
- $filelist[] = str_replace('.php', '', $file);
- }
- }
- closedir($dir);
- sort($filelist);
- foreach ($filelist as $file) {
- if ($file == $selected) {
- $sel = ' selected';
- } else {
- $sel = '';
- }
- $text .= "<option value=\"$file\"$sel>$file</option>";
- }
- break;
- case 'THEME' :
- $dir = opendir('templates');
- while (false !== ($file = readdir($dir))) {
- if ($file != '.' && $file != '..' && $file != 'CVS') {
- $filelist[] = str_replace('.php', '', $file);
- }
- }
- closedir($dir);
- sort($filelist);
- foreach ($filelist as $file) {
- if ($file == $selected) {
- $sel = ' selected';
- } else {
- $sel = '';
- }
- $text .= "<option value=\"$file\"$sel>$file</option>";
- }
- break;
- case 'STYLE' :
- $dir = opendir('styles');
- while (false !== ($file = readdir($dir))) {
- if ($file != '.' && $file != '..' && $file != 'CVS') {
- $filelist[] = str_replace('.css', '', $file);
- }
- }
- closedir($dir);
- sort($filelist);
- foreach ($filelist as $file) {
- if ($file == $selected) {
- $sel = ' selected';
- } else {
- $sel = '';
- }
- $text .= "<option value=\"$file\"$sel>$file</option>";
- }
- break;
- default :
- $deadarray = $select[$box];
- while(list($val,$item) = each($deadarray)) {
- if ($selected == $val and $selected != '') $sel = ' selected';
- else $sel = '';
- $text .= "<option value=\"$val\"$sel>$item</option>";
- }
- break;
- }
- echo $text;
+ if (isset($cfgDatabase[$box])) {
+ $querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
+ $querymid = ' where sort_order > 0 order by sort_order';
+ $queries = array(
+ 'group' => $querystart.' where group_name <> \'User\' order by group_name',
+ 'severity' => $querystart.$querymid,
+ 'site' => $querystart.$querymid,
+ 'status' => $querystart.$querymid,
+ 'resolution' => $querystart.$querymid,
+ 'project' => $perm->have_perm('Admin')
+ ? $querystart." where ".
+ ($selected ? "(active > 0 or project_id in ($selected))" : 'active > 0').
+ " order by {$box}_name"
+ : $querystart." where project_id not in ($restricted_projects)".
+ " and ".
+ ($selected ? " (active > 0 or project_id in ($selected))" : 'active > 0').
+ " order by {$box}_name",
+ 'component' => $querystart." where project_id = $project and active = 1 order by {$box}_name",
+ 'version' => $querystart." where project_id = $project and active = 1 order by {$box}_id desc",
+ 'database' => "select {$box}_id, {$box}_name, {$box}_version from $cfgDatabase[$box]".$querymid
+ );
+ }
+
+ switch($box) {
+ case 'user_filter':
+ foreach ($STRING['user_filter'] as $k => $v) {
+ $text .= sprintf("<option value=\"%d\"%s>%s</option>",
+ $k, ($k == $selected ? ' selected' : ''), $v);
+ }
+ break;
+ case 'group':
+ if ($project) { // If we are building for project admin page
+ if (!count($selected) or (count($selected) && in_array(0, $selected))) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text = "<option value=\"all\"$sel>All Groups</option>";
+ }
+ $rs = $db->query($queries[$box]);
+ while ($rs->fetchInto($row)) {
+ if (count($selected) && in_array($row[$box.'_id'], $selected)) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= '<option value="'.
+ $row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
+ }
+ break;
+ case 'severity':
+ case 'status':
+ case 'resolution':
+ case 'project':
+ case 'site':
+ case 'component':
+ case 'version':
+ $rs = $db->query($queries[$box]);
+ while ($rs->fetchInto($row)) {
+ if ($selected == $row[$box.'_id'] and $selected != '') {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= '<option value="'.
+ $row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
+ }
+ break;
+ case 'database':
+ $text = '<option value="0">None</option>';
+ $rs = $db->query($queries[$box]);
+ while ($rs->fetchInto($row)) {
+ if ($selected == $row[$box.'_id'] and $selected != '') {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= '<option value="'.
+ $row[$box.'_id'].'"'.$sel.'>'.$row[$box.'_name'].' '.$row[$box.'_version'].'</option>';
+ }
+ break;
+ case 'os':
+ $rs = $db->query("select {$box}_id, {$box}_name, regex from ".TBL_OS." where sort_order > 0 order by sort_order");
+ while ($rs->fetchInto($row)) {
+ if ($selected == '' and isset($row['Regex']) and
+ preg_match($row['Regex'],$GLOBALS['HTTP_USER_AGENT'])) {
+ $sel = ' selected';
+ } elseif ($selected == $row[$box.'_id']) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= '<option value="'.$row[$box.'_id']."\"$sel>".$row[$box.'_name']."</option>";
+ }
+ break;
+ case 'owner':
+ $rs = $db->query("select u.user_id, login from ".TBL_AUTH_USER." u, ".TBL_USER_GROUP." ug, ".TBL_AUTH_GROUP." g where u.active > 0 and u.user_id = ug.user_id and ug.group_id = g.group_id and group_name = 'Developer' order by login");
+ while ($rs->fetchInto($row)) {
+ if ($selected == $row['user_id']) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= "<option value=\"{$row['user_id']}\"$sel>{$row['login']}</option>";
+ }
+ break;
+ case 'bug_cc':
+ $rs = $db->query(sprintf($QUERY['functions-bug-cc'], $selected));
+ while (list($uid, $user) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
+ $text .= "<option value=\"$uid\">".maskemail($user).'</option>';
+ }
+ // Pad the sucker
+ $text .= '<option value="" disabled>';
+ for ($i = 0; $i < 30; $i++) {
+ $text .= ' ';
+ }
+ $text .= '</option>';
+ break;
+ case 'LANGUAGE' :
+ $dir = opendir('languages');
+ while (false !== ($file = readdir($dir))) {
+ if ($file != '.' && $file != '..' && $file != 'CVS') {
+ $filelist[] = str_replace('.php', '', $file);
+ }
+ }
+ closedir($dir);
+ sort($filelist);
+ foreach ($filelist as $file) {
+ if ($file == $selected) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= "<option value=\"$file\"$sel>$file</option>";
+ }
+ break;
+ case 'THEME' :
+ $dir = opendir('templates');
+ while (false !== ($file = readdir($dir))) {
+ if ($file != '.' && $file != '..' && $file != 'CVS') {
+ $filelist[] = str_replace('.php', '', $file);
+ }
+ }
+ closedir($dir);
+ sort($filelist);
+ foreach ($filelist as $file) {
+ if ($file == $selected) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= "<option value=\"$file\"$sel>$file</option>";
+ }
+ break;
+ case 'STYLE' :
+ $dir = opendir('styles');
+ while (false !== ($file = readdir($dir))) {
+ if ($file != '.' && $file != '..' && $file != 'CVS') {
+ $filelist[] = str_replace('.css', '', $file);
+ }
+ }
+ closedir($dir);
+ sort($filelist);
+ foreach ($filelist as $file) {
+ if ($file == $selected) {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= "<option value=\"$file\"$sel>$file</option>";
+ }
+ break;
+ default :
+ $deadarray = $select[$box];
+ while(list($val,$item) = each($deadarray)) {
+ if ($selected == $val and $selected != '') {
+ $sel = ' selected';
+ } else {
+ $sel = '';
+ }
+ $text .= "<option value=\"$val\"$sel>$item</option>";
+ }
+ break;
+ }
+ echo ($text);
}
///
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:27:07
|
Update of /cvsroot/phpbt/phpbt In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt Modified Files: include.php install.php query.php Log Message: SITE TRACKING and localization of query templates. Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- include.php 12 Jun 2002 11:39:11 -0000 1.119 +++ include.php 13 Jun 2002 14:26:34 -0000 1.120 @@ -81,6 +81,7 @@ 'to_be_closed_in_version_name' => 'To be Closed in Version', 'database_version' => 'Database Version', 'database_provider' => 'Database Provider', + 'site_name' => 'Site', 'reporter' => 'Reporter', 'owner' => 'Owner', 'created_date' => 'Created Date', Index: install.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/install.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- install.php 19 May 2002 11:54:22 -0000 1.28 +++ install.php 13 Jun 2002 14:26:34 -0000 1.29 @@ -94,7 +94,8 @@ '/TBL_USER_PREF/' => $_pv['tbl_prefix'].'user_pref', '/TBL_VERSION/' => $_pv['tbl_prefix'].'version', '/TBL_PROJECT_GROUP/' => $_pv['tbl_prefix'].'project_group', - '/TBL_DATABASE/' => $_pv['tbl_prefix'].'database', + '/TBL_DATABASE/' => $_pv['tbl_prefix'].'database_server', + '/TBL_SITE/' => $_pv['tbl_prefix'].'site', '/OPTION_ADMIN_EMAIL/' => $_pv['admin_login'], '/OPTION_ADMIN_PASS/' => $_pv['encrypt_pass'] ? md5($_pv['admin_pass']) : $_pv['admin_pass'], Index: query.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/query.php,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- query.php 12 Jun 2002 13:50:49 -0000 1.78 +++ query.php 13 Jun 2002 14:26:34 -0000 1.79 @@ -195,6 +195,7 @@ 'closed_in_version_name' => 'version3.version_name as v3', 'database_provider' => TBL_DATABASE.'.database_name', 'database_version' => TBL_DATABASE.'.database_version', + 'site_name' => 'site.site_name', 'component_name' => 'component.component_name', 'os_name' => 'os.os_name', 'browser_string' => 'browser_string', @@ -222,6 +223,7 @@ 'closed_in_version_name' => 'v3', 'database_provider' => TBL_DATABASE.'.database_name', 'database_version' => TBL_DATABASE.'.database_version', + 'site_name' => 'site.sort_order', 'browser_string' => 'browser_string', 'resolution_name' => 'resolution.sort_order', 'close_date' => 'close_date' |
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:26:43
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt/templates/default
Modified Files:
queryform-simple.html queryform.html
Log Message:
SITE TRACKING and localization of query templates.
Index: queryform-simple.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform-simple.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- queryform-simple.html 13 Jun 2002 09:23:40 -0000 1.7
+++ queryform-simple.html 13 Jun 2002 14:26:37 -0000 1.8
@@ -28,55 +28,55 @@
<form method="get" action="query.php" name="query">
<table>
<tr valign="baseline">
- <td valign="top"><b>{$TITLE._Project}:</b></td>
+ <td valign="top"><b>{$STRING._Project}:</b></td>
<td valign="top">
<select name="projects" onChange="updateMenus(this.form)">
- <option value=''>{$TITLE._opt_All}</option>
+ <option value=''>{$STRING._opt_All}</option>
{build_select box=project}
</select>
</td>
</tr>
<tr valign="baseline">
- <td valign="top"><b>{$TITLE._Version}:</b></td>
+ <td valign="top"><b>{$STRING._Version}:</b></td>
<td valign="top">
- <select name="versions"><option value=''>{$TITLE._opt_All}</option></select>
+ <select name="versions"><option value=''>{$STRING._opt_All}</option></select>
</td>
</tr>
<tr valign="baseline">
- <td valign="top"><b>{$TITLE._Component}:</b></td>
+ <td valign="top"><b>{$STRING._Component}:</b></td>
<td valign="top">
- <select name="components"><option value=''>{$TITLE._opt_All}</option></select>
+ <select name="components"><option value=''>{$STRING._opt_All}</option></select>
</td>
</tr>
<tr valign="baseline">
- <td valign="top"><b>{$TITLE._Status}:</b></td>
+ <td valign="top"><b>{$STRING._Status}:</b></td>
<td valign="top">
<select name="status[]" multiple size="7">{build_select box=status}</select>
</td>
</tr>
<tr valign="baseline">
- <td valign="top"><b>{$TITLE._SortBy}:</b></td>
+ <td valign="top"><b>{$STRING._SortBy}:</b></td>
<td valign="top">
<select name="order">
<option value="bug_id">
- {$TITLE._SortBy_BugNumber}
+ {$STRING._SortBy_BugNumber}
</option>
<option selected value="severity.sort_order">
- {$TITLE._SortBy_Severity}
+ {$STRING._SortBy_Severity}
</option>
<option value="reporter">
- {$TITLE._SortBy_Reporter}
+ {$STRING._SortBy_Reporter}
</option>
<option value="status.sort_order">
- {$TITLE._SortBy_Status}
+ {$STRING._SortBy_Status}
</option>
<option value="priority">
- {$TITLE._SortBy_Priority}
+ {$STRING._SortBy_Priority}
</option>
</select>
<select name="sort">
- <option selected value="asc">{$TITLE._SortAsc}</option>
- <option value="desc">{$TITLE._SortDesc}</option>
+ <option selected value="asc">{$STRING._SortAsc}</option>
+ <option value="desc">{$STRING._SortDesc}</option>
</select>
</td>
</tr>
@@ -84,20 +84,20 @@
<br>
<br>
{if $smarty.session.uid}
- {$TITLE._SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
+ {$STRING._SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
<br><br>
{/if}
<input type="hidden" name="op" value="doquery">
- <input type="reset" value="{$TITLE._ResetBackToDefaultQuery}">
- <input type="submit" value="{$TITLE._SubmitQuery}">
+ <input type="reset" value="{$STRING._ResetBackToDefaultQuery}">
+ <input type="submit" value="{$STRING._SubmitQuery}">
{if count($queries)}
<br><br>
- <b>{$TITLE._SavedQueries}</b>
+ <b>{$STRING._SavedQueries}</b>
<br>
{section name=query loop=$queries}
- <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=simple" onClick="return confirm('{$TITLE._SureDeleteSavedQuery}');">{$STRING.delete}</a>)<br>
+ <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=simple" onClick="return confirm('{$STRING._SureDeleteSavedQuery}');">{$STRING.delete}</a>)<br>
{/section}
{/if}
</form>
<br>
- {$TITLE._1GoToThe} <a href="{$smarty.server.PHP_SELF}?op=query&form=advanced">{$TITLE._1AdvancedQueryPage}</a>
+ {$STRING._1GoToThe} <a href="{$smarty.server.PHP_SELF}?op=query&form=advanced">{$STRING._1AdvancedQueryPage}</a>
Index: queryform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- queryform.html 13 Jun 2002 09:23:40 -0000 1.15
+++ queryform.html 13 Jun 2002 14:26:39 -0000 1.16
@@ -25,212 +25,132 @@
{/literal}
//-->
</script>
- <form method="get" action="query.php" name="query">
- <table>
- <tr>
- <th align="left">{$TITLE._Status}:</th>
- <th align="left">Resolution:</th>
- <th align="left">OpSys:</th>
- <th align="left">Priority:</th>
- <th align="left">Severity:</th>
- </tr>
-
- <tr>
- <td align="left" valign="top">
- <select name="status[]" multiple size="7">{build_select box=status}</select>
- </td>
- <td align="left" valign="top">
- <select name="resolution[]" multiple size="7">{build_select box=resolution}</select>
- </td>
- <td align="left" valign="top">
- <select name="os[]" multiple size="7">{build_select box=os}</select>
- </td>
- <td align="left" valign="top">
- <select name="priority[]" multiple size="7">{build_select box=priority}</select>
- </td>
- <td align="left" valign="top">
- <select name="severity[]" multiple size="7">{build_select box=severity}</select>
- </td>
- </tr>
- </table>
- <br>
- <br>
- <table>
- <tr>
- <td>
- <table border="1" cellspacing="0" cellpadding="0">
- <tr>
- <td>
- <table cellspacing="0" cellpadding="0">
- <tr>
- <td rowspan="2" valign="top">
- <select name="emailsearch1">
- <option value="email">Email</option>
- <option value="login">Login</option>
- </select>
- : <input name="email1" size="30" value=""> matching
- as <select name="emailtype1">
- <option value="rlike">
- regexp
- </option>
-
- <option value="not rlike">
- not regexp
- </option>
-
- <option selected value="like">
- substring
- </option>
-
- <option value="=">
- exact
- </option>
- </select> </td>
-
- <td><input type="checkbox" name="emailfield1[]" value="owner"
- checked>Assigned To</td>
- </tr>
-
- <tr>
- <td><input type="checkbox" name="emailfield1[]" value="reporter">
- Reporter</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-
- <table border="0">
- <tr>
- <td align="right">Summary:</td>
-
- <td><input name="title" size="30" value=""></td>
-
- <td><select name="title_type">
- <option value="like" selected>
- substring
- </option>
-
- <option value="rlike">
- regular expression
- </option>
-
- <option value="not rlike">
- not ( regular expression )
- </option>
- </select></td>
- </tr>
-
- <tr>
- <td align="right">A description entry:</td>
-
- <td><input name="description" size="30" value=""></td>
-
- <td><select name="description_type">
- <option value="like" selected>
- substring
- </option>
-
- <option value="rlike">
- regular expression
- </option>
-
- <option value="not rlike">
- not ( regular expression )
- </option>
- </select></td>
- </tr>
-
- <tr>
- <td align="right">URL:</td>
-
- <td><input name="url" size="30" value=""></td>
-
- <td><select name="url_type">
- <option value="like" selected>
- substring
- </option>
-
- <option value="rlike">
- regular expression
- </option>
-
- <option value="not rlike">
- not ( regular expression )
- </option>
- </select></td>
- </tr>
- </table>
-
- <hr align="left" width="100%">
- <table>
+<form method="get" action="query.php" name="query">
+ <table>
+ <tr>
+ <th align="left">{$STRING._Status}:</th>
+ <th align="left">{$STRING._Resolution}:</th>
+ <th align="left">{$STRING._OpSys}:</th>
+ <th align="left">{$STRING._Priority}:</th>
+ <th align="left">{$STRING._Severity}:</th>
+ <th align="left">{$STRING._Database}:</th>
+ <th align="left">{$STRING._ReportedOnSite}:</th>
+ </tr><tr>
+ <td align="left" valign="top"><select name="status[]"
+ multiple size="7">{build_select box=status}</select></td>
+ <td align="left" valign="top"><select name="resolution[]"
+ multiple size="7">{build_select box=resolution}</select></td>
+ <td align="left" valign="top"><select name="os[]"
+ multiple size="7">{build_select box=os}</select></td>
+ <td align="left" valign="top"><select name="priority[]"
+ multiple size="7">{build_select box=priority}</select></td>
+ <td align="left" valign="top"><select name="severity[]"
+ multiple size="7">{build_select box=severity}</select></td>
+ <td align="left" valign="top"><select name="database[]"
+ multiple size="7">{build_select box=database}</select></td>
+ <td align="left" valign="top"><select name="site[]"
+ multiple size="7">{build_select box=site}</select></td>
+ </tr>
+ </table>
+ <br><br>
+ <table>
+ <tr>
+ <td><table border="1" cellspacing="0" cellpadding="0">
+ <tr>
+ <td><table cellspacing="0" cellpadding="0" border="0">
<tr>
- <td><b>{$TITLE._Project}:</b></td>
- <td>
- <select name="projects" onChange="updateMenus(this.form)">
- <option value=''>{$TITLE._opt_All}</option>
- {build_select box=project}
- </select>
- </td>
+ <td rowspan="2" valign="top"><select
+ name="emailsearch1">
+ <option value="email">Email</option>
+ <option value="login">Login</option>
+ </select>: <input name="email1"
+ size="30" value=""> {$STRING._MatchingAs}
+ <select name="emailtype1">
+ <option value="rlike">{$STRING._MatchingAs_Regexp}</option>
+ <option value="not rlike">{$STRING._MatchingAs_NotRegexp}</option>
+ <option selected value="like">{$STRING._MatchingAs_Substring}</option>
+ <option value="=">{$STRING._MatchingAs_Exact}</option>
+ </select></td>
+ <td><input type="checkbox"
+ name="emailfield1[]" value="owner"
+ checked>{$STRING._eMail_AssignedTo}</td>
+ </tr><tr>
+ <td><input type="checkbox" name="emailfield1[]"
+ value="reporter">{$STRING._eMail_Reporter}</td>
</tr>
- <tr>
- <td><b>{$TITLE._Version}:</b></td>
- <td>
- <select name="versions"><option value=''>{$TITLE._opt_All}</option></select>
- </td>
- </tr>
- <tr>
- <td><b>{$TITLE._Component}:</b></td>
- <td>
- <select name="components"><option value=''>{$TITLE._opt_All}</option></select>
- </td>
- </tr>
- </table>
- <hr align="left" width="100%">
- <input type="hidden" name="op" value="doquery">
- <nobr><b>{$TITLE._SortBy}:</b>
- <select name="order">
- <option value="bug_id">
- {$TITLE._SortBy_BugNumber}
- </option>
- <option selected value="severity.sort_order">
- {$TITLE._SortBy_Severity}
- </option>
- <option value="reporter.login">
- {$TITLE._SortBy_Reporter}
- </option>
- <option value="status.sort_order">
- {$TITLE._SortBy_Status}
- </option>
- <option value="priority">
- {$TITLE._SortBy_Priority}
- </option>
- </select>
- <select name="sort">
- <option selected value="asc">{$TITLE._SortAsc}</option>
- <option value="desc">{$TITLE._SortDesc}</option>
- </select>
- </nobr>
- <br>
- <br>
- {if $smarty.session.uid}
- {$TITLE._SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
- <br><br>
- {/if}
- <input type="reset" value="{$TITLE._ResetBackToDefaultQuery}">
- <input type="submit" value="{$TITLE._SubmitQuery}">
- {if count($queries)}
- <br><br>
- <b>{$TITLE._SavedQueries}</b>
- <br>
- {section name=query loop=$queries}
- <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=advanced" onClick="return confirm('Are you sure you want to delete this saved query?');">Delete</a>)<br>
- {/section}
- {/if}
- </form>
- <br>
- {$TITLE._1GoToThe} <a href="{$smarty.server.PHP_SELF}?op=query">simple query page</a>
-
+ </table></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table>
+ <table border="0">
+ <tr>
+ <td align="right">{$STRING._Summary}:</td>
+ <td><input name="title" size="30" value=""></td>
+ <td><select name="title_type">
+ <option value="like" selected>{$STRING._MatchingAs_Substring}</option>
+ <option value="rlike">{$STRING._MatchingAs_Regexp}</option>
+ <option value="not rlike">{$STRING._MatchingAs_NotRegexp}</option>
+ </select></td>
+ </tr><tr>
+ <td align="right">{$STRING._DescriptionEntry}:</td>
+ <td><input name="description" size="30" value=""></td>
+ <td><select name="description_type">
+ <option value="like" selected>{$STRING._MatchingAs_Substring}</option>
+ <option value="rlike">{$STRING._MatchingAs_Regexp}</option>
+ <option value="not rlike">{$STRING._MatchingAs_NotRegexp}</option>
+ </select></td>
+ </tr><tr>
+ <td align="right">URL:</td>
+ <td><input name="url" size="30" value=""></td>
+ <td><select name="url_type">
+ <option value="like" selected>{$STRING._MatchingAs_Substring}</option>
+ <option value="rlike">{$STRING._MatchingAs_Regexp}</option>
+ <option value="not rlike">{$STRING._MatchingAs_NotRegexp}</option>
+ </select></td>
+ </tr>
+ </table>
+ <hr align="left" width="100%">
+ <table>
+ <tr>
+ <td><b>{$STRING._Project}:</b></td>
+ <td><select name="projects" onChange="updateMenus(this.form)">
+ <option value=''>{$STRING._opt_All}</option>{build_select box=project}</select></td>
+ </tr><tr>
+ <td><b>{$STRING._Version}:</b></td>
+ <td><select name="versions"><option value=''>{$STRING._opt_All}</option></select></td>
+ </tr><tr>
+ <td><b>{$STRING._Component}:</b></td>
+ <td><select name="components"><option value=''>{$STRING._opt_All}</option></select></td>
+ </tr>
+ </table>
+ <hr align="left" width="100%">
+ <input type="hidden" name="op" value="doquery">
+ <b>{$STRING._SortBy}:</b>
+ <select name="order">
+ <option value="bug_id">{$STRING._SortBy_BugNumber}</option>
+ <option selected value="severity.sort_order">{$STRING._SortBy_Severity}</option>
+ <option value="reporter.login">{$STRING._SortBy_Reporter}</option>
+ <option value="status.sort_order">{$STRING._SortBy_Status}</option>
+ <option value="priority">{$STRING._SortBy_Priority}</option>
+ </select>
+ <select name="sort">
+ <option selected value="asc">{$STRING._SortAsc}</option>
+ <option value="desc">{$STRING._SortDesc}</option>
+ </select>
+ </nobr>
+ <br><br>
+{if $smarty.session.uid}
+ {$STRING._SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
+ <br><br>
+{/if}
+ <input type="reset" value="{$STRING._ResetBackToDefaultQuery}">
+ <input type="submit" value="{$STRING._SubmitQuery}">
+{if count($queries)}
+ <br><br><b>{$STRING._SavedQueries}</b><br>
+ {section name=query loop=$queries}
+ <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=advanced" onClick="return confirm('Are you sure you want to delete this saved query?');">Delete</a>)<br>
+ {/section}
+{/if}
+</form>
+<br>{$STRING._1GoToThe} <a href="{$smarty.server.PHP_SELF}?op=query">{$STRING._1SimpleQueryPage}</a>
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:26:43
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt/templates/default/admin
Modified Files:
wrap.html
Added Files:
site-edit.html sitelist.html
Log Message:
SITE TRACKING and localization of query templates.
--- NEW FILE: site-edit.html ---
<b>{$page_title} </b>
<hr size="1">
<form action="{$smarty.server.PHP_SELF}" method="post">
<input type="hidden" name="site_id" value="{$site_id}">
<input type="hidden" name="use_js" value="{$smarty.request.use_js}">
<table border='0'>
{if $error}
<tr>
<td colspan="2" class="error">{$error}</td>
</tr>
{/if}
<tr>
<td align="right" valign="top">{$STRING.name}:</td>
<td><input type="text" size="20" maxlength="50" name="site_name" value="{$site_name|stripslashes|htmlspecialchars}"></td>
</tr>
<tr>
<td align="right" valign="top">{$STRING.sortorder}:</td>
<td><input type="text" size="3" maxlength="3" name="sort_order" value="{$sort_order}"></td>
</tr>
</table>
<br>
<input type="submit" name="submit">
</form>
--- NEW FILE: sitelist.html ---
<script language="JavaScript">
<!--
var me = '{$SCRIPT_NAME}';
{literal}
function popupSite(id) {
window.open(me + '?op=edit&use_js=1&site_id='+id, 'ewin', 'dependent=yes,width=350,height=300,scrollbars=1');
}
{/literal}
// -->
</script>
<table border="0" width="100%">
<tr>
<td valign="top">
<b> {$STRING.sitelist'}</b> - <a href="{$SCRIPT_NAME}?op=edit&site_id=0" onClick="popupSite(0); return false;">{$STRING.addnewsite}</a>
<hr size="1">
<table border="0" cellpadding="2" cellspacing="1" width="100%">
<tr>
<th class="{$headers.name.class}"><a href="{$headers.name.url}">{$STRING.name}</a></th>
<th class="{$headers.sortorder.class}"><a href="{$headers.sortorder.url}">{$STRING.sortorder}</a></th>
<th>{$STRING.delete}</th>
</tr>
{section name=site loop=$sites}
<tr{if $smarty.section.site.iteration is even} class="alt"{/if}>
<td><a href="{$SCRIPT_NAME}?op=edit&site_id={$sites[site].site_id}" onClick="popupSite({$sites[site].site_id}); return false;">{$sites[site].site_name|stripslashes|htmlspecialchars}</a></td>
<td align="center">{$sites[site].sort_order}</td>
<td align="center">
{if not $sites[site].bug_count}
<a href="{$SCRIPT_NAME}?op=del&site_id={$sites[site].site_id}" onClick="return confirm('{$STRING.suredeletesite}')">{$STRING.delete}</a>
{/if}
</td>
</tr>
{/section}
<tr>
<td colspan="4" align="center">
<br>
{$first} - {$last} of {$total}
<br>
{if $pages ne "1"}[ {$pages} ]{/if}
<br>
</td>
</tr>
</table>
<br>
</td>
</tr>
</table>
Index: wrap.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/wrap.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wrap.html 12 Jun 2002 12:47:54 -0000 1.13
+++ wrap.html 13 Jun 2002 14:26:40 -0000 1.14
@@ -1,9 +1,9 @@
<html>
<head>
- <META HTTP-EQUIV="Expires" CONTENT="-1">
- <title>phpBugTracker Admin - {$page_title}</title>
- <link rel="StyleSheet" href="../styles/{$STYLE}.css" type="text/css">
- <META http-equiv="Content-Type" content="text/html; charset={$STRING.lang_charset}">
+ <META HTTP-EQUIV="Expires" CONTENT="-1">
+ <title>phpBugTracker Admin - {$page_title}</title>
+ <link rel="StyleSheet" href="../styles/{$STYLE}.css" type="text/css">
+ <META http-equiv="Content-Type" content="text/html; charset={$STRING.lang_charset}">
</head>
<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
<table width="100%" cellspacing="0" cellpadding="0" height="100%">
@@ -48,6 +48,9 @@
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='database.php'">
<a href="database.php" class="sidenavlink">{$TITLE.database}</a>
+ </div>
+ <div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='site.php'">
+ <a href="site.php" class="sidenavlink">{$TITLE.site}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='../docs/html/userguide.html'">
<a href="../docs/html/userguide.html" class="sidenavlink">{$TITLE.documentation}</a>
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 14:26:40
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32492/phpbt/admin
Added Files:
site.php
Log Message:
SITE TRACKING and localization of query templates.
--- NEW FILE: site.php ---
<?php
// site.php - Interface to the site table
// ------------------------------------------------------------------------
// Copyright (c) 2001, 2002 The phpBugTracker Group
// ------------------------------------------------------------------------
// This file is part of phpBugTracker
//
// phpBugTracker is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// phpBugTracker is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with phpBugTracker; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ------------------------------------------------------------------------
// $Id: site.php,v 1.1 2002/06/13 14:26:34 firma Exp $
chdir('..');
define('TEMPLATE_PATH', 'admin');
include 'include.php';
function del_item($siteid = 0) {
global $db, $me;
if ($siteid) {
// Make sure we are going after a valid record
$itemexists = $db->getOne('select count(*) from '.TBL_SITE.
" where site_id = $siteid");
// Are there any bugs tied to this one?
$bugcount = $db->getOne('select count(*) from '.TBL_BUG.
" where site_id = $siteid");
if ($itemexists and !$bugcount) {
$db->query('delete from '.TBL_SITE." where site_id = $siteid");
}
}
header("Location: $me?");
}
function do_form($siteid = 0) {
global $db, $me, $_pv, $STRING, $t;
extract($_pv);
$error = '';
// Validation
if (!$site_name = trim($site_name))
$error = $STRING['givename'];
if ($error) { show_form($siteid, $error); return; }
if (!$siteid) {
$db->query('insert into '.TBL_SITE.' (site_id, site_name, sort_order) '.
'values ('.$db->nextId(TBL_SITE).', '.$db->quote(stripslashes($site_name)).
', '.$sort_order.')');
} else {
$db->query('update '.TBL_SITE.' set site_name = '.
$db->quote(stripslashes($site_name)).', sort_order = '.
$sort_order.' where site_id = '.$site_id);
}
if ($use_js) {
$t->display('admin/edit-submit.html');
} else {
header("Location: $me?");
}
}
function show_form($siteid = 0, $error = '') {
global $db, $me, $t, $_pv, $STRING;
if ($siteid && !$error) {
$t->assign($db->getRow("select * from ".TBL_SITE.
" where site_id = '$siteid'"));
} else {
$t->assign($_pv);
}
$t->assign('error', $error);
$t->wrap('admin/site-edit.html', ($siteid ? 'editsite' : 'addsite'));
}
function list_items($siteid = 0, $error = '') {
global $me, $db, $t, $_gv, $STRING, $TITLE, $QUERY;
if (empty($_gv['order'])) {
$order = 'sort_order';
$sort = 'asc';
} else {
$order = $_gv['order'];
$sort = $_gv['sort'];
}
$page = isset($_gv['page']) ? $_gv['page'] : 0;
$nr = $db->getOne("select count(*) from ".TBL_SITE);
list($selrange, $llimit) = multipages($nr, $page, "order=$order&sort=$sort");
$t->assign('sites', $db->getAll($db->modifyLimitQuery(
sprintf($QUERY['admin-list-sites'], $order, $sort), $llimit, $selrange)));
$headers = array(
'siteid' => 'site_id',
'name' => 'site_name',
'sortorder' => 'sort_order');
sorting_headers($me, $headers, $order, $sort);
$t->wrap('admin/sitelist.html', 'site');
}
$perm->check('Admin');
if (isset($_gv['op'])) {
switch($_gv['op']) {
case 'add':
list_items();
break;
case 'edit':
show_form($_gv['site_id']);
break;
case 'del':
del_item($_gv['site_id']);
break;
}
} elseif(isset($_pv['submit'])) {
do_form($_pv['site_id']);
} else {
list_items();
}
?>
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 11:29:43
|
Update of /cvsroot/phpbt/phpbt/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv12852/phpbt/schemas
Modified Files:
mysql.in oci8.in pgsql.in
Log Message:
Started adding environment tracking. Named the table TBL_SITE and will call the feature SITE TRACKING rather than obsoleted ENVIRONMENT TRACKING from now, because it's better self-explanatory.
Index: mysql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysql.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mysql.in 19 May 2002 11:48:30 -0000 1.29
+++ mysql.in 13 Jun 2002 11:29:39 -0000 1.30
@@ -63,6 +63,7 @@
status_id tinyint(3) unsigned NOT NULL default '0',
resolution_id tinyint(3) unsigned NOT NULL default '0',
database_id tinyint(3) unsigned NOT NULL default '0',
+ site_id tinyint(3) unsigned NOT NULL default '0',
assigned_to int(10) unsigned NOT NULL default '0',
created_by int(10) unsigned NOT NULL default '0',
created_date bigint(20) unsigned NOT NULL default '0',
@@ -254,13 +255,20 @@
) TYPE=MyISAM;
CREATE TABLE TBL_DATABASE (
- database_id int(10) unsigned NOT NULL default '0',
+ database_id tinyint(3) unsigned NOT NULL default '0',
database_name varchar(30) NOT NULL default '',
database_version varchar(10) NOT NULL default '',
sort_order tinyint(3) unsigned NOT NULL default '0',
PRIMARY KEY (database_id)
) TYPE=MyISAM;
+CREATE TABLE TBL_SITE (
+ site_id tinyint(3) unsigned NOT NULL default '0',
+ site_name varchar(50) NOT NULL default '',
+ sort_order tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (site_id)
+) TYPE=MyISAM;
+
#
# -- Insert initial data --
#
@@ -388,3 +396,12 @@
INSERT INTO TBL_DATABASE VALUES (3,'PostgreSQL','7.1.3',3);
create table TBL_DATABASE_seq (id int unsigned auto_increment not null primary key);
insert into TBL_DATABASE_seq values (3);
+
+# Examples only
+INSERT INTO TBL_SITE VALUES (0,'All',1);
+INSERT INTO TBL_SITE VALUES (1,'Production - location 1',2);
+INSERT INTO TBL_SITE VALUES (2,'Production - location 2',3);
+INSERT INTO TBL_SITE VALUES (3,'Test site - location 1',4);
+INSERT INTO TBL_SITE VALUES (4,'Test site - location 2',5);
+create table TBL_SITE_seq (id int unsigned auto_increment not null primary key);
+insert into TBL_SITE_seq values (4);
Index: oci8.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/oci8.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- oci8.in 18 May 2002 16:07:14 -0000 1.13
+++ oci8.in 13 Jun 2002 11:29:39 -0000 1.14
@@ -63,6 +63,7 @@
status_id number(3) default '0' NOT NULL,
resolution_id number(3) default '0' NOT NULL,
database_id number(3) default '0' NOT NULL,
+ site_id number(3) default '0' NOT NULL,
assigned_to number(10) default '0' NOT NULL,
created_by number(10) default '0' NOT NULL,
created_date number(20) default '0' NOT NULL,
@@ -259,13 +260,20 @@
) ;
CREATE TABLE TBL_DATABASE (
- database_id number(10) default '0' NOT NULL,
+ database_id number(3) default '0' NOT NULL,
database_name varchar2(30) default '' NOT NULL,
database_version varchar2(10) default '' NOT NULL,
sort_order number(3) default '0' NOT NULL,
PRIMARY KEY (database_id)
);
+CREATE TABLE TBL_SITE (
+ site_id number(3) default '0' NOT NULL,
+ site_name varchar2(50) default '' NOT NULL,
+ sort_order number(3) default '0' NOT NULL,
+ PRIMARY KEY (site_id)
+);
+
INSERT INTO TBL_AUTH_USER
(user_id, login, first_name, last_name, email, password)
values (1, 'OPTION_ADMIN_EMAIL', 'System', 'Admin', 'OPTION_ADMIN_EMAIL',
@@ -382,3 +390,10 @@
INSERT INTO TBL_DATABASE VALUES (2,'MySQL','3.23.49',2);
INSERT INTO TBL_DATABASE VALUES (3,'PostgreSQL','7.1.3',3);
CREATE SEQUENCE TBL_DATABASE_seq START WITH 4 NOCACHE;
+
+INSERT INTO TBL_SITE VALUES (0,'All',1);
+INSERT INTO TBL_SITE VALUES (1,'Production - location 1',2);
+INSERT INTO TBL_SITE VALUES (2,'Production - location 2',3);
+INSERT INTO TBL_SITE VALUES (3,'Test site - location 1',4);
+INSERT INTO TBL_SITE VALUES (4,'Test site - location 2',5);
+CREATE SEQUENCE TBL_SITE_seq START WITH 5 NOCACHE;
Index: pgsql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/pgsql.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pgsql.in 18 May 2002 16:07:14 -0000 1.30
+++ pgsql.in 13 Jun 2002 11:29:39 -0000 1.31
@@ -66,6 +66,7 @@
status_id INT2 NOT NULL DEFAULT '0',
resolution_id INT2 NOT NULL DEFAULT '0',
database_id INT2 NOT NULL DEFAULT '0',
+ site_id INT2 NOT NULL DEFAULT '0',
assigned_to INT4 NOT NULL DEFAULT '0',
created_by INT4 NOT NULL DEFAULT '0',
created_date INT8 NOT NULL DEFAULT '0',
@@ -252,13 +253,20 @@
);
CREATE TABLE TBL_DATABASE (
- database_id INT4 NOT NULL DEFAULT '0',
+ database_id INT2 NOT NULL DEFAULT '0',
database_name varchar(30) NOT NULL DEFAULT '',
database_version varchar(10) NOT NULL DEFAULT '',
sort_order INT2 NOT NULL DEFAULT '0',
PRIMARY KEY (database_id)
);
+CREATE TABLE TBL_SITE (
+ site_id INT2 NOT NULL DEFAULT '0',
+ site_name varchar(50) NOT NULL DEFAULT '',
+ sort_order INT2 NOT NULL DEFAULT '0',
+ PRIMARY KEY (site_id)
+);
+
--
-- -- Insert initial data --
--
@@ -380,6 +388,13 @@
INSERT INTO TBL_DATABASE VALUES (3,'PostgreSQL','7.1.3',3);
CREATE SEQUENCE TBL_DATABASE_seq START 3;
+INSERT INTO TBL_SITE VALUES (0,'All',1);
+INSERT INTO TBL_SITE VALUES (1,'Production - location 1',2);
+INSERT INTO TBL_SITE VALUES (2,'Production - location 2',3);
+INSERT INTO TBL_SITE VALUES (3,'Test site - location 1',4);
+INSERT INTO TBL_SITE VALUES (4,'Test site - location 2',5);
+CREATE SEQUENCE TBL_SITE_seq START 4;
+
--
-- Indexes for table TBL_GROUP_PERM
--
@@ -403,7 +418,6 @@
--
CREATE INDEX group_id_TBL_BUG_GROUP_index ON TBL_BUG_GROUP (group_id);
-
COMMIT;
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 11:29:43
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv12852/phpbt
Modified Files:
config-dist.php config.php
Log Message:
Started adding environment tracking. Named the table TBL_SITE and will call the feature SITE TRACKING rather than obsoleted ENVIRONMENT TRACKING from now, because it's better self-explanatory.
Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-dist.php 21 May 2002 12:44:58 -0000 1.17
+++ config-dist.php 13 Jun 2002 11:29:39 -0000 1.18
@@ -64,6 +64,7 @@
define ('TBL_VERSION', TBL_PREFIX.'version');
define ('TBL_PROJECT_GROUP', TBL_PREFIX.'project_group');
define ('TBL_DATABASE', TBL_PREFIX.'database_server');
+define ('TBL_SITE', TBL_PREFIX.'site');
define ('ONEDAY', 86400);
Index: config.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config.php 21 May 2002 12:44:58 -0000 1.31
+++ config.php 13 Jun 2002 11:29:39 -0000 1.32
@@ -66,6 +66,7 @@
define ('TBL_VERSION', TBL_PREFIX.'version');
define ('TBL_PROJECT_GROUP', TBL_PREFIX.'project_group');
define ('TBL_DATABASE', TBL_PREFIX.'database_server');
+define ('TBL_SITE', TBL_PREFIX.'site');
define ('ONEDAY', 86400);
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 09:23:43
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv12398/phpbt/templates/default
Modified Files:
queryform-simple.html queryform.html
Log Message:
Added some JavaScript (BTW: there is no 'language' attribute in standart, but 'type' only), some localization.
Index: queryform-simple.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform-simple.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- queryform-simple.html 8 Jun 2002 20:28:52 -0000 1.6
+++ queryform-simple.html 13 Jun 2002 09:23:40 -0000 1.7
@@ -1,9 +1,11 @@
-<script language="JavaScript">
+<script type="text/JavaScript">
<!--
versions = new Array();
components = new Array();
+closedversions = new Array();
versions['All'] = new Array(new Array('','All'));
components['All'] = new Array(new Array('','All'));
+closedversions['All'] = new Array(new Array('','All'));
{project_js}
{literal}
@@ -25,56 +27,56 @@
</script>
<form method="get" action="query.php" name="query">
<table>
- <tr>
- <td valign="top"><b>Project:</b></td>
+ <tr valign="baseline">
+ <td valign="top"><b>{$TITLE._Project}:</b></td>
<td valign="top">
<select name="projects" onChange="updateMenus(this.form)">
- <option value=''>All</option>
+ <option value=''>{$TITLE._opt_All}</option>
{build_select box=project}
</select>
</td>
</tr>
- <tr>
- <td valign="top"><b>Version:</b></td>
+ <tr valign="baseline">
+ <td valign="top"><b>{$TITLE._Version}:</b></td>
<td valign="top">
- <select name="versions"><option value=''>All</option></select>
+ <select name="versions"><option value=''>{$TITLE._opt_All}</option></select>
</td>
</tr>
- <tr>
- <td valign="top"><b>Component:</b></td>
+ <tr valign="baseline">
+ <td valign="top"><b>{$TITLE._Component}:</b></td>
<td valign="top">
- <select name="components"><option value=''>All</option></select>
+ <select name="components"><option value=''>{$TITLE._opt_All}</option></select>
</td>
</tr>
- <tr>
- <td valign="top"><b>Status:</b></td>
+ <tr valign="baseline">
+ <td valign="top"><b>{$TITLE._Status}:</b></td>
<td valign="top">
<select name="status[]" multiple size="7">{build_select box=status}</select>
</td>
</tr>
- <tr>
- <td valign="top"><b>Sort By:</b></td>
+ <tr valign="baseline">
+ <td valign="top"><b>{$TITLE._SortBy}:</b></td>
<td valign="top">
<select name="order">
<option value="bug_id">
- Bug Number
+ {$TITLE._SortBy_BugNumber}
</option>
<option selected value="severity.sort_order">
- Severity
+ {$TITLE._SortBy_Severity}
</option>
<option value="reporter">
- Reporter
+ {$TITLE._SortBy_Reporter}
</option>
<option value="status.sort_order">
- Status
+ {$TITLE._SortBy_Status}
</option>
<option value="priority">
- Priority
+ {$TITLE._SortBy_Priority}
</option>
</select>
<select name="sort">
- <option selected value="asc">Ascending</option>
- <option value="desc">Descending</option>
+ <option selected value="asc">{$TITLE._SortAsc}</option>
+ <option value="desc">{$TITLE._SortDesc}</option>
</select>
</td>
</tr>
@@ -82,20 +84,20 @@
<br>
<br>
{if $smarty.session.uid}
- Save this query as: <input maxlength="40" type="text" name="savedqueryname">
+ {$TITLE._SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
<br><br>
{/if}
<input type="hidden" name="op" value="doquery">
- <input type="reset" value="Reset back to the default query">
- <input type="submit" value="Submit query">
+ <input type="reset" value="{$TITLE._ResetBackToDefaultQuery}">
+ <input type="submit" value="{$TITLE._SubmitQuery}">
{if count($queries)}
<br><br>
- <b>Saved Queries</b>
+ <b>{$TITLE._SavedQueries}</b>
<br>
{section name=query loop=$queries}
- <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=simple" onClick="return confirm('Are you sure you want to delete this saved query?');">Delete</a>)<br>
+ <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=simple" onClick="return confirm('{$TITLE._SureDeleteSavedQuery}');">{$STRING.delete}</a>)<br>
{/section}
{/if}
</form>
<br>
- Go to the <a href="{$smarty.server.PHP_SELF}?op=query&form=advanced">advanced query page</a>
+ {$TITLE._1GoToThe} <a href="{$smarty.server.PHP_SELF}?op=query&form=advanced">{$TITLE._1AdvancedQueryPage}</a>
Index: queryform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- queryform.html 12 Jun 2002 13:50:49 -0000 1.14
+++ queryform.html 13 Jun 2002 09:23:40 -0000 1.15
@@ -1,8 +1,10 @@
-<script language="JavaScript">
+<script type="text/JavaScript">
<!--
versions = new Array();
+closedversions = new Array();
components = new Array();
versions['All'] = new Array(new Array('','All'));
+closedversions['All'] = new Array(new Array('','All'));
components['All'] = new Array(new Array('','All'));
{project_js}
@@ -26,7 +28,7 @@
<form method="get" action="query.php" name="query">
<table>
<tr>
- <th align="left">Status:</th>
+ <th align="left">{$TITLE._Status}:</th>
<th align="left">Resolution:</th>
<th align="left">OpSys:</th>
<th align="left">Priority:</th>
@@ -166,63 +168,63 @@
<hr align="left" width="100%">
<table>
<tr>
- <td><b>Project:</b></td>
+ <td><b>{$TITLE._Project}:</b></td>
<td>
<select name="projects" onChange="updateMenus(this.form)">
- <option value=''>All</option>
+ <option value=''>{$TITLE._opt_All}</option>
{build_select box=project}
</select>
</td>
</tr>
<tr>
- <td><b>Version:</b></td>
+ <td><b>{$TITLE._Version}:</b></td>
<td>
- <select name="versions"><option value=''>All</option></select>
+ <select name="versions"><option value=''>{$TITLE._opt_All}</option></select>
</td>
</tr>
<tr>
- <td><b>Component:</b></td>
+ <td><b>{$TITLE._Component}:</b></td>
<td>
- <select name="components"><option value=''>All</option></select>
+ <select name="components"><option value=''>{$TITLE._opt_All}</option></select>
</td>
</tr>
</table>
<hr align="left" width="100%">
<input type="hidden" name="op" value="doquery">
- <nobr><b>Sort By:</b>
+ <nobr><b>{$TITLE._SortBy}:</b>
<select name="order">
<option value="bug_id">
- Bug Number
+ {$TITLE._SortBy_BugNumber}
</option>
<option selected value="severity.sort_order">
- Severity
+ {$TITLE._SortBy_Severity}
</option>
<option value="reporter.login">
- Reporter
+ {$TITLE._SortBy_Reporter}
</option>
<option value="status.sort_order">
- Status
+ {$TITLE._SortBy_Status}
</option>
<option value="priority">
- Priority
+ {$TITLE._SortBy_Priority}
</option>
</select>
<select name="sort">
- <option selected value="asc">Ascending</option>
- <option value="desc">Descending</option>
+ <option selected value="asc">{$TITLE._SortAsc}</option>
+ <option value="desc">{$TITLE._SortDesc}</option>
</select>
</nobr>
<br>
<br>
{if $smarty.session.uid}
- Save this query as: <input maxlength="40" type="text" name="savedqueryname">
+ {$TITLE._SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
<br><br>
{/if}
- <input type="reset" value="Reset back to the default query">
- <input type="submit" value="Submit query">
+ <input type="reset" value="{$TITLE._ResetBackToDefaultQuery}">
+ <input type="submit" value="{$TITLE._SubmitQuery}">
{if count($queries)}
<br><br>
- <b>Saved Queries</b>
+ <b>{$TITLE._SavedQueries}</b>
<br>
{section name=query loop=$queries}
<a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a> (<a href="{$smarty.server.PHP_SELF}?op=delquery&queryid={$queries[query].saved_query_id}&form=advanced" onClick="return confirm('Are you sure you want to delete this saved query?');">Delete</a>)<br>
@@ -230,5 +232,5 @@
{/if}
</form>
<br>
- Go to the <a href="{$smarty.server.PHP_SELF}?op=query">simple query page</a>
+ {$TITLE._1GoToThe} <a href="{$smarty.server.PHP_SELF}?op=query">simple query page</a>
|
|
From: Jirka P. <fi...@us...> - 2002-06-13 09:09:19
|
Update of /cvsroot/phpbt/phpbt/languages In directory usw-pr-cvs1:/tmp/cvs-serv6345/phpbt/languages Modified Files: cz.php cz_iso-8859-2.php en.php Log Message: Added some strings and titles (maybe there is another array, say $INPUT, needed, but this have to be dealt by Ben) into en and translated. Mostly for simple query page. Index: cz.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/cz.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cz.php 12 Jun 2002 12:42:11 -0000 1.10 +++ cz.php 13 Jun 2002 09:09:14 -0000 1.11 @@ -86,7 +86,7 @@ 'suredeletedb' => 'Opravdu chcete odstranit tuto databázi?', 'delete' => 'Odstranit', 'version' => 'Verze' - ); + ); // Page titles $TITLE = array( @@ -117,23 +117,44 @@ 'accountcreated' => 'Úèet vytvoøen', 'changessaved' => 'Zmìny uloeny', 'preferences' => 'Uivatelská nastavení', - 'usertools' => 'Uivatelská nástroje', - 'edituser' => 'Zmìnit Uivatele', - 'adduser' => 'Pøidat Uivatele', - 'editstatus' => 'Zmìnit Status', - 'addstatus' => 'Pøidat Status', - 'editseverity' => 'Zmìnit Dùleitost', - 'addseverity' => 'Pøidat Dùleitost', - 'editresolution' => 'Zmìnit Rozhodnutí', - 'addresolution' => 'Pøidat Rozhodnutí', - 'editos' => 'Zmìnit Operaèní systém', - 'addos' => 'Pøidat Operaèní systém', - 'editgroup' => 'Zmìnit Skupinu', - 'addgroup' => 'Pøidat Skupinu', + 'usertools' => 'Uivatelské nástroje', + 'edituser' => 'Zmìnit uivatele', + 'adduser' => 'Pøidat uivatele', + 'editstatus' => 'Zmìnit status', + 'addstatus' => 'Pøidat status', + 'editseverity' => 'Zmìnit dùleitost', + 'addseverity' => 'Pøidat dùleitost', + 'editresolution' => 'Zmìnit rozhodnutí', + 'addresolution' => 'Pøidat rozhodnutí', + 'editos' => 'Zmìnit operaèní systém', + 'addos' => 'Pøidat operaèní systém', + 'editgroup' => 'Zmìnit skupinu', + 'addgroup' => 'Pøidat skupinu', 'configuration' => 'Nastavení', 'adddatabase' => 'Pøidat databázi', 'editdatabase' => 'Upravit databázi', 'database' => 'Databáze', - 'documentation' => 'Dokumentace' - ); + 'documentation' => 'Dokumentace', + '_opt_All' => 'Ve', + '_Project' => 'Projekt', + '_Version' => 'Verze', + '_Component' => 'Komponenta', + '_Status' => 'Status', + '_SortBy' => 'Tøídit podle', + '_SortBy_BugNumber' => 'Èísla BUGu', + '_SortBy_Severity' => 'Dùleitosti', + '_SortBy_Reporter' => 'Reportéra', + '_SortBy_Priority' => 'Priority', + '_SortBy_Status' => 'Statutu', + '_SortAsc' => 'Vzestupnì', + '_SortDesc' => 'Sestupnì', + '_SaveThisQueryAs' => 'Uloit tento dotaz jako', + '_ResetBackToDefaultQuery' => 'Zpìt k pùvodnímu dotazu', + '_SubmitQuery' => 'Odeslat dotaz', + '_SavedQueries' => 'Uloené dotazy', + '_1GoToThe' => 'Pøejít na', + '_1AdvancedQueryPage' => 'stránku pokroèilého vyhledávání', + '_SureDeleteSavedQuery' => 'Jste si jisti, e chcete odstranit tento uloený dotaz?' + ); ?> + Index: cz_iso-8859-2.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/cz_iso-8859-2.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cz_iso-8859-2.php 12 Jun 2002 12:42:12 -0000 1.7 +++ cz_iso-8859-2.php 13 Jun 2002 09:09:14 -0000 1.8 @@ -117,23 +117,43 @@ 'accountcreated' => 'Úèet vytvoøen', 'changessaved' => 'Zmìny ulo¾eny', 'preferences' => 'U¾ivatelská nastavení', - 'usertools' => 'U¾ivatelská nástroje', - 'edituser' => 'Zmìnit U¾ivatele', - 'adduser' => 'Pøidat U¾ivatele', - 'editstatus' => 'Zmìnit Status', - 'addstatus' => 'Pøidat Status', - 'editseverity' => 'Zmìnit Dùle¾itost', - 'addseverity' => 'Pøidat Dùle¾itost', - 'editresolution' => 'Zmìnit Rozhodnutí', - 'addresolution' => 'Pøidat Rozhodnutí', - 'editos' => 'Zmìnit Operaèní systém', - 'addos' => 'Pøidat Operaèní systém', - 'editgroup' => 'Zmìnit Skupinu', - 'addgroup' => 'Pøidat Skupinu', + 'usertools' => 'U¾ivatelské nástroje', + 'edituser' => 'Zmìnit u¾ivatele', + 'adduser' => 'Pøidat u¾ivatele', + 'editstatus' => 'Zmìnit status', + 'addstatus' => 'Pøidat status', + 'editseverity' => 'Zmìnit dùle¾itost', + 'addseverity' => 'Pøidat dùle¾itost', + 'editresolution' => 'Zmìnit rozhodnutí', + 'addresolution' => 'Pøidat rozhodnutí', + 'editos' => 'Zmìnit operaèní systém', + 'addos' => 'Pøidat operaèní systém', + 'editgroup' => 'Zmìnit skupinu', + 'addgroup' => 'Pøidat skupinu', 'configuration' => 'Nastavení', 'adddatabase' => 'Pøidat databázi', 'editdatabase' => 'Upravit databázi', 'database' => 'Databáze', - 'documentation' => 'Dokumentace' - ); + 'documentation' => 'Dokumentace', + '_opt_All' => 'V¹e', + '_Project' => 'Projekt', + '_Version' => 'Verze', + '_Component' => 'Komponenta', + '_Status' => 'Status', + '_SortBy' => 'Tøídit podle', + '_SortBy_BugNumber' => 'Èísla BUGu', + '_SortBy_Severity' => 'Dùle¾itosti', + '_SortBy_Reporter' => 'Reportéra', + '_SortBy_Status' => 'Statutu', + '_SortBy_Priority' => 'Priority', + '_SortAsc' => 'Vzestupnì', + '_SortDesc' => 'Sestupnì', + '_SaveThisQueryAs' => 'Ulo¾t tento dotaz jako', + '_ResetBackToDefaultQuery' => 'Zpìt k pùvodnímu dotazu', + '_SubmitQuery' => 'Odeslat dotaz', + '_SavedQueries' => 'Ulo¾ené dotazy', + '_1GoToThe' => 'Pøejít na', + '_1AdvancedQueryPage' => 'stránku pokroèilého vyhledávání', + '_SureDeleteSavedQuery' => 'Jste si jisti, ¾e chcete smazat tento ulo¾ený dotaz?' + ); ?> Index: en.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/en.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- en.php 12 Jun 2002 12:42:12 -0000 1.19 +++ en.php 13 Jun 2002 09:09:14 -0000 1.20 @@ -86,7 +86,7 @@ 'suredeletedb' => 'Are you sure to delete this database?', 'delete' => 'Delete', 'version' => 'Version' - ); + ); // Page titles $TITLE = array( @@ -134,7 +134,26 @@ 'adddatabase' => 'Add Database', 'editdatabase' => 'Edit Database', 'database' => 'Databases', - 'documentation' => 'Read documentation' - ); - + 'documentation' => 'Read documentation', + '_opt_All' => 'All', + '_Project' => 'Project', + '_Version' => 'Version', + '_Component' => 'Component', + '_Status' => 'Status', + '_SortBy' => 'Sort By', + '_SortBy_BugNumber' => 'Bug Number', + '_SortBy_Severity' => 'Severity', + '_SortBy_Reporter' => 'Reporter', + '_SortBy_Priority' => 'Priority', + '_SortBy_Status' => 'Status', + '_SortAsc' => 'Ascending', + '_SortDesc' => 'Descending', + '_SaveThisQueryAs' => 'Save this query as', + '_ResetBackToDefaultQuery' => 'Reset back to default query', + '_SubmitQuery' => 'Submit query', + '_SavedQueries' => 'Saved Queries', + '_1GoToThe' => 'Go to the', + '_1AdvancedQueryPage' => 'Advanced query page', + '_SureDeleteSavedQuery' => 'Are you sure to delete this saved query?' + ); ?> |
|
From: Jirka P. <fi...@us...> - 2002-06-12 13:50:53
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv30452/phpbt/templates/default
Modified Files:
queryform.html
Log Message:
Bugfix 562086. Maybe other fields have to be added, not only the reporter.
Index: queryform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- queryform.html 8 Jun 2002 20:28:52 -0000 1.13
+++ queryform.html 12 Jun 2002 13:50:49 -0000 1.14
@@ -197,7 +197,7 @@
<option selected value="severity.sort_order">
Severity
</option>
- <option value="reporter">
+ <option value="reporter.login">
Reporter
</option>
<option value="status.sort_order">
|
|
From: Jirka P. <fi...@us...> - 2002-06-12 13:50:52
|
Update of /cvsroot/phpbt/phpbt In directory usw-pr-cvs1:/tmp/cvs-serv30452/phpbt Modified Files: query.php Log Message: Bugfix 562086. Maybe other fields have to be added, not only the reporter. Index: query.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/query.php,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- query.php 12 Jun 2002 11:39:11 -0000 1.77 +++ query.php 12 Jun 2002 13:50:49 -0000 1.78 @@ -210,7 +210,7 @@ 'priority' => 'b.priority', 'status_name' => 'status.sort_order', 'owner' => 'owner', - 'reporter' => 'reporter', + 'reporter' => 'reporter.login', 'lastmodifier' => 'last_modifier', 'created_date' => 'b.created_date', 'last_modified_date' => 'b.last_modified_date', |
|
From: Jirka P. <fi...@us...> - 2002-06-12 13:01:32
|
> Update of /cvsroot/phpbt/phpbt/templates/default > In directory usw-pr-cvs1:/tmp/cvs-serv8094/templates/default > > Modified Files: > =09bugdisplay.html > Log Message: > Updated for closed_version and to_be_closed_version. May be a little bug= gy -- needs testing > Mhmm ... there may be something wrong. I've tested it (from scratch) and ev= erything goes OK, except Closed in Version, which doesn't change. Maybe the= re is other script, which have to be changed. I can't remember exactly what= I've changed when I was adding to be closed in version and database tracki= ng. I thought "Closed in Version" will be added automatically, when closing a b= ug. It's good to have it changeable by hand, but not necessary. What do you= think about it? BTW: Design is good. |
|
From: Jirka P. <fi...@us...> - 2002-06-12 12:47:57
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv9426/phpbt/templates/default/admin
Modified Files:
wrap.html
Log Message:
Some titles, you know ...
Index: wrap.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/wrap.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wrap.html 21 May 2002 10:05:01 -0000 1.12
+++ wrap.html 12 Jun 2002 12:47:54 -0000 1.13
@@ -23,37 +23,37 @@
<td width="150" class="sidenav">
<!-- Nav Links -->
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='configure.php'">
- <a href="configure.php" class="sidenavlink">Configuration</a>
+ <a href="configure.php" class="sidenavlink">{$TITLE.configuration}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='project.php'">
- <a href="project.php" class="sidenavlink">Projects</a>
+ <a href="project.php" class="sidenavlink">{$TITLE.project}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='user.php'">
- <a href="user.php" class="sidenavlink">Users</a>
+ <a href="user.php" class="sidenavlink">{$TITLE.user}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='group.php'">
- <a href="group.php" class="sidenavlink">Groups</a>
+ <a href="group.php" class="sidenavlink">{$TITLE.group}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='status.php'">
- <a href="status.php" class="sidenavlink">Statuses</a>
+ <a href="status.php" class="sidenavlink">{$TITLE.status}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='resolution.php'">
- <a href="resolution.php" class="sidenavlink">Resolutions</a>
+ <a href="resolution.php" class="sidenavlink">{$TITLE.resolution}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='severity.php'">
- <a href="severity.php" class="sidenavlink">Severities</a>
+ <a href="severity.php" class="sidenavlink">{$TITLE.severity}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='os.php'">
- <a href="os.php" class="sidenavlink">OSes</a>
+ <a href="os.php" class="sidenavlink">{$TITLE.os}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='database.php'">
- <a href="database.php" class="sidenavlink">{$STRING.databases}</a>
+ <a href="database.php" class="sidenavlink">{$TITLE.database}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='../docs/html/userguide.html'">
- <a href="../docs/html/userguide.html" class="sidenavlink">Read Documentation</a>
+ <a href="../docs/html/userguide.html" class="sidenavlink">{$TITLE.documentation}</a>
</div>
<div class="navbox" onMouseOver="this.className='navboxselected'" onMouseOut="this.className='navbox'" onClick="document.location.href='../index.php'">
- <a href="../index.php" class="sidenavlink">User Tools</a>
+ <a href="../index.php" class="sidenavlink">{$TITLE.usertools}</a>
</div>
</td>
<td class="maincontent">
|
|
From: Benjamin C. <bc...@us...> - 2002-06-12 12:43:52
|
Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv8369/inc
Modified Files:
functions.php
Log Message:
Updated for closed_version and to_be_closed_version. May be a little buggy -- needs testing
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- functions.php 5 Jun 2002 15:25:08 -0000 1.30
+++ functions.php 12 Jun 2002 12:43:49 -0000 1.31
@@ -31,7 +31,7 @@
'text' => $text,
'iserror' => $iserror
));
- $t->display('error.html');
+ $t->wrap('error.html');
}
$select['priority'] = array(
@@ -364,7 +364,7 @@
global $db, $u, $perm, $_sv, $QUERY;
extract($params);
- $js = '';
+ $js = ''; $js2 = '';
// Build the javascript-powered select boxes
if ($perm->have_perm('Admin')) {
@@ -376,17 +376,24 @@
}
while (list($pid, $pname) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
$pname = addslashes($pname);
- // Version array
- $js .= "versions['$pname'] = new Array(";
- $js .= (!isset($no_all) || !$no_all) ? "new Array('','All')," : '';
+ // Version arrays
+ $js .= "versions['$pname'] = new Array(".
+ ((!isset($no_all) or !$no_all) ? "new Array('','All')," : '');
+ $js2 = "closedversions['$pname'] = new Array(".
+ ((!isset($no_all) or !$no_all) ? "new Array('','All'),"
+ : "new Array(0, 'Choose One'),");
$rs2 = $db->query("select version_name, version_id from ".TBL_VERSION.
" where project_id = $pid and active = 1");
while (list($version,$vid) = $rs2->fetchRow(DB_FETCHMODE_ORDERED)) {
$version = addslashes($version);
$js .= "new Array($vid,'$version'),";
+ $js2 .= "new Array($vid,'$version'),";
}
if (substr($js,-1) == ',') $js = substr($js,0,-1);
$js .= ");\n";
+ if (substr($js2,-1) == ',') $js2 = substr($js2,0,-1);
+ $js2 .= ");\n";
+ $js .= $js2;
// Component array
$js .= "components['$pname'] = new Array(";
|
|
From: Benjamin C. <bc...@us...> - 2002-06-12 12:43:13
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv8094/templates/default
Modified Files:
bugdisplay.html
Log Message:
Updated for closed_version and to_be_closed_version. May be a little buggy -- needs testing
Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bugdisplay.html 24 May 2002 15:19:16 -0000 1.33
+++ bugdisplay.html 12 Jun 2002 12:43:10 -0000 1.34
@@ -1,8 +1,10 @@
<script language="JavaScript">
<!--
versions = new Array();
+ closedversions = new Array();
components = new Array();
versions['All'] = new Array(new Array('','All'));
+ closedversions['All'] = new Array(new Array('','All'));
components['All'] = new Array(new Array('','All'));
{project_js no_all=true}
@@ -13,11 +15,28 @@
for (var x = 0; x < versions[sel].length; x++) {
f.version_id.options[x].value = versions[sel][x][0];
f.version_id.options[x].text = versions[sel][x][1];
+ f.version_id.selectedIndex = 0;
}
+
+ f.to_be_closed_in_version_id.length = closedversions[sel].length;
+ for (var x = 0; x < closedversions[sel].length; x++) {
+ f.to_be_closed_in_version_id.options[x].value = closedversions[sel][x][0];
+ f.to_be_closed_in_version_id.options[x].text = closedversions[sel][x][1];
+ f.to_be_closed_in_version_id.selectedIndex = 0;
+ }
+
+ f.closed_in_version_id.length = closedversions[sel].length;
+ for (var x = 0; x < closedversions[sel].length; x++) {
+ f.closed_in_version_id.options[x].value = closedversions[sel][x][0];
+ f.closed_in_version_id.options[x].text = closedversions[sel][x][1];
+ f.closed_in_version_id.selectedIndex = 0;
+ }
+
f.component_id.length = components[sel].length;
for (var x = 0; x < components[sel].length; x++) {
f.component_id.options[x].value = components[sel][x][0];
f.component_id.options[x].text = components[sel][x][1];
+ f.component_id.selectedIndex = 0;
}
}
@@ -93,23 +112,40 @@
{$STRING.version}:
</td>
<td>
- <select name="version_id">{build_select box=version selected=$version_id project=$project_id}</select> /
- <select name="to_be_closed_in_version_id">{build_select box=version selected=$to_be_closed_in_version_id project=$project_id}</select>
+ <select name="version_id">{build_select box=version selected=$version_id project=$project_id}</select>
</td>
- <td rowspan="2">
+ <td>
OS:
</td>
- <td rowspan="2">
+ <td>
<select name="os_id">{build_select box=os selected=$os_id}</select>
</td>
</tr>
<tr>
+ <td>To Be Closed Version</td>
+ <td>
+ <select name="to_be_closed_in_version_id">
+ <option value="0">Choose One</option>
+ {build_select box=version selected=$to_be_closed_in_version_id project=$project_id}
+ </select>
+ </td>
<td>
{$STRING.database}:
</td>
<td>
<select name="database_id">{build_select box=database selected=$database_id}</select>
</td>
+ </tr>
+ <tr>
+ <td>Closed Version</td>
+ <td>
+
+ <select name="closed_in_version_id">
+ <option value="0">Choose One</option>
+ {build_select box=version selected=$closed_in_version_id project=$project_id}
+ </select>
+ </td>
+ <td colspan="2"> </td>
</tr>
<tr>
<td>Summary:</td>
|
|
From: Jirka P. <fi...@us...> - 2002-06-12 12:42:15
|
Update of /cvsroot/phpbt/phpbt/languages In directory usw-pr-cvs1:/tmp/cvs-serv7483/phpbt/languages Modified Files: cz.php cz_iso-8859-2.php en.php Log Message: Added some titles (mostly) for wrap.html. Index: cz.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/cz.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cz.php 21 May 2002 09:50:19 -0000 1.9 +++ cz.php 12 Jun 2002 12:42:11 -0000 1.10 @@ -117,6 +117,7 @@ 'accountcreated' => 'Úèet vytvoøen', 'changessaved' => 'Zmìny uloeny', 'preferences' => 'Uivatelská nastavení', + 'usertools' => 'Uivatelská nástroje', 'edituser' => 'Zmìnit Uivatele', 'adduser' => 'Pøidat Uivatele', 'editstatus' => 'Zmìnit Status', @@ -132,6 +133,7 @@ 'configuration' => 'Nastavení', 'adddatabase' => 'Pøidat databázi', 'editdatabase' => 'Upravit databázi', - 'database' => 'Databáze' + 'database' => 'Databáze', + 'documentation' => 'Dokumentace' ); ?> Index: cz_iso-8859-2.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/cz_iso-8859-2.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cz_iso-8859-2.php 21 May 2002 09:50:19 -0000 1.6 +++ cz_iso-8859-2.php 12 Jun 2002 12:42:12 -0000 1.7 @@ -117,6 +117,7 @@ 'accountcreated' => 'Úèet vytvoøen', 'changessaved' => 'Zmìny ulo¾eny', 'preferences' => 'U¾ivatelská nastavení', + 'usertools' => 'U¾ivatelská nástroje', 'edituser' => 'Zmìnit U¾ivatele', 'adduser' => 'Pøidat U¾ivatele', 'editstatus' => 'Zmìnit Status', @@ -132,6 +133,7 @@ 'configuration' => 'Nastavení', 'adddatabase' => 'Pøidat databázi', 'editdatabase' => 'Upravit databázi', - 'database' => 'Databáze' + 'database' => 'Databáze', + 'documentation' => 'Dokumentace' ); ?> Index: en.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/languages/en.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- en.php 21 May 2002 09:50:19 -0000 1.18 +++ en.php 12 Jun 2002 12:42:12 -0000 1.19 @@ -117,6 +117,7 @@ 'accountcreated' => 'Account Created', 'changessaved' => 'Changes Saved', 'preferences' => 'User Preferences', + 'usertools' => 'User Tools', 'edituser' => 'Edit User', 'adduser' => 'Add User', 'editstatus' => 'Edit Status', @@ -132,7 +133,8 @@ 'configuration' => 'Configuration', 'adddatabase' => 'Add Database', 'editdatabase' => 'Edit Database', - 'database' => 'Databases' + 'database' => 'Databases', + 'documentation' => 'Read documentation' ); ?> |
|
From: Jirka P. <fi...@us...> - 2002-06-12 12:28:50
|
Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1217/phpbt/templates/default/admin
Modified Files:
severitylist.html
Log Message:
Minor change. Used localized string (from TITLE).
Index: severitylist.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/severitylist.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- severitylist.html 18 May 2002 03:00:50 -0000 1.9
+++ severitylist.html 12 Jun 2002 12:28:47 -0000 1.10
@@ -12,7 +12,7 @@
<table border="0" width="100%">
<tr>
<td valign="top">
- <b> {$page_title}</b> - <a href="{$smarty.server.PHP_SELF}?op=edit&severity_id=0" onClick="popupSeverity(0); return false;">{$STRING.addnew} Severity</a>
+ <b> {$page_title}</b> - <a href="{$smarty.server.PHP_SELF}?op=edit&severity_id=0" onClick="popupSeverity(0); return false;">{$TITLE.addseverity}</a>
<hr size="1">
<table border="0" cellpadding="2" cellspacing="1" width="100%">
<tr>
|
|
From: Jirka P. <fi...@us...> - 2002-06-12 12:05:10
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv21510/phpbt/templates/default
Modified Files:
index.html
Log Message:
Fix.
Index: index.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- index.html 10 Jun 2002 12:52:35 -0000 1.10
+++ index.html 12 Jun 2002 12:05:07 -0000 1.11
@@ -23,7 +23,7 @@
<b>Saved Queries</b>
<br>
{section name=query loop=$queries}
- <a href="{$smarty.server.PHP_SELF}?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a><br>
+ <a href="query.php?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a><br>
{/section}
{/if}
</td>
|
|
From: Jirka P. <fi...@us...> - 2002-06-12 11:39:15
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv1927/phpbt
Modified Files:
query.php include.php
Log Message:
Added some fields needed for [to be] closed in version tracking and database tracking. I think it's really hard to understand what file have to be changed, when doing something like this, so please check it for my mistakes. I've tested it a bit, but it have to be tested harder. Let me know.
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- query.php 8 Jun 2002 20:28:30 -0000 1.76
+++ query.php 12 Jun 2002 11:39:11 -0000 1.77
@@ -176,47 +176,56 @@
$QUERY;
$query_db_fields = array(
- 'bug_id' => 'bug_id',
- 'title' => 'title',
- 'description' => 'description',
- 'url' => 'url',
- 'severity_name' => 'severity.severity_name',
- 'priority' => 'priority',
- 'status_name' => 'status.status_name',
- 'resolution_name' => 'resolution_name',
- 'reporter' => 'reporter.login as reporter',
- 'owner' => 'owner.login as owner',
- 'created_date' => 'b.created_date',
- 'lastmodifier' => 'lastmodifier.login as lastmodifier',
- 'last_modified_date' => 'b.last_modified_date',
- 'project_name' => 'project.project_name',
- 'version_name' => 'version.version_name',
- 'component_name' => 'component.component_name',
- 'os_name' => 'os.os_name',
- 'browser_string' => 'browser_string',
- 'close_date' => 'close_date'
+ 'bug_id' => 'bug_id',
+ 'title' => 'title',
+ 'description' => 'description',
+ 'url' => 'url',
+ 'severity_name' => 'severity.severity_name',
+ 'priority' => 'priority',
+ 'status_name' => 'status.status_name',
+ 'resolution_name' => 'resolution_name',
+ 'reporter' => 'reporter.login as reporter',
+ 'owner' => 'owner.login as owner',
+ 'created_date' => 'b.created_date',
+ 'lastmodifier' => 'lastmodifier.login as lastmodifier',
+ 'last_modified_date' => 'b.last_modified_date',
+ 'project_name' => 'project.project_name',
+ 'version_name' => 'version.version_name',
+ 'to_be_closed_in_version_name' => 'version2.version_name as v2',
+ 'closed_in_version_name' => 'version3.version_name as v3',
+ 'database_provider' => TBL_DATABASE.'.database_name',
+ 'database_version' => TBL_DATABASE.'.database_version',
+ 'component_name' => 'component.component_name',
+ 'os_name' => 'os.os_name',
+ 'browser_string' => 'browser_string',
+ 'close_date' => 'close_date'
);
$db_headers = array(
- 'bug_id' => 'bug_id',
- 'title' => 'title',
- 'description' => 'description',
- 'url' => 'url',
- 'severity_name' => 'severity.sort_order',
- 'priority' => 'b.priority',
- 'status_name' => 'status.sort_order',
- 'owner' => 'owner',
- 'reporter' => 'reporter',
- 'lastmodifier' => 'last_modifier',
- 'created_date' => 'b.created_date',
- 'last_modified_date' => 'b.last_modified_date',
- 'project_name' => 'project_name',
- 'component_name' => 'component_name',
- 'version_name' => 'version_name',
- 'os_name' => 'os_name',
- 'browser_string' => 'browser_string',
- 'resolution_name' => 'resolution.sort_order',
- 'close_date' => 'close_date');
+ 'bug_id' => 'bug_id',
+ 'title' => 'title',
+ 'description' => 'description',
+ 'url' => 'url',
+ 'severity_name' => 'severity.sort_order',
+ 'priority' => 'b.priority',
+ 'status_name' => 'status.sort_order',
+ 'owner' => 'owner',
+ 'reporter' => 'reporter',
+ 'lastmodifier' => 'last_modifier',
+ 'created_date' => 'b.created_date',
+ 'last_modified_date' => 'b.last_modified_date',
+ 'project_name' => 'project_name',
+ 'component_name' => 'component_name',
+ 'version_name' => 'version_name',
+ 'os_name' => 'os_name',
+ 'to_be_closed_in_version_name' => 'v2',
+ 'closed_in_version_name' => 'v3',
+ 'database_provider' => TBL_DATABASE.'.database_name',
+ 'database_version' => TBL_DATABASE.'.database_version',
+ 'browser_string' => 'browser_string',
+ 'resolution_name' => 'resolution.sort_order',
+ 'close_date' => 'close_date'
+ );
extract($_gv);
if (!isset($page)) {
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- include.php 19 May 2002 16:59:16 -0000 1.118
+++ include.php 12 Jun 2002 11:39:11 -0000 1.119
@@ -77,6 +77,10 @@
'priority' => 'Priority',
'status_name' => 'Status',
'resolution_name' => 'Resolution',
+ 'closed_in_version_name' => 'Closed in Version',
+ 'to_be_closed_in_version_name' => 'To be Closed in Version',
+ 'database_version' => 'Database Version',
+ 'database_provider' => 'Database Provider',
'reporter' => 'Reporter',
'owner' => 'Owner',
'created_date' => 'Created Date',
|
|
From: John W. <jp...@us...> - 2002-06-11 21:51:06
|
Ben Curtis wrote: > Yup, exactly. > > On Tue, Jun 11, 2002 at 12:48:23PM -0000, Jirka Pech wrote: > >>>I think what would be better in this case is to have a user option >>>controlling it, rather than an admin option. >> >>You mean checkbox on user's personal page? I agree. >> From the roadmap, I've been working (slowly) on the 'template selection by user' feature. I've looked at an approach that is more complicated than is needed to just handle the user selectable template but it creates a structure that allows more configurable items (like this checkbox) to be added quite easily - I figured it wouldn't be long before there was a request for another user configurable item... I hope to get the user template stuff completed in the next week or so and I'll explain this all properly then and hopefully this will help implement the query form option checkbox. Sorry if this is garbled but it's been a long day... john |
|
From: Ben C. <php...@be...> - 2002-06-11 13:02:37
|
Yup, exactly. On Tue, Jun 11, 2002 at 12:48:23PM -0000, Jirka Pech wrote: > > I think what would be better in this case is to have a user option > > controlling it, rather than an admin option. > > You mean checkbox on user's personal page? I agree. > |
|
From: Jirka P. <fi...@us...> - 2002-06-11 12:48:31
|
> I think what would be better in this case is to have a user option > controlling it, rather than an admin option. You mean checkbox on user's personal page? I agree. |
2 messages has been excluded from this view by a project administrator.
