[phpBT-dev] CVS: phpbt/templates/default queryform-simple.html,1.9,1.10 queryform.html,1.17,1.18

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv16143/templates/default

Modified Files:
	queryform-simple.html queryform.html 
Log Message:
Allow users to override saved queries by saving a new query with the same name as an old one.

Index: queryform-simple.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform-simple.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- queryform-simple.html	17 Jun 2002 09:21:52 -0000	1.9
+++ queryform-simple.html	5 Nov 2002 20:43:50 -0000	1.10
@@ -1,5 +1,5 @@
 <script type="text/JavaScript">
-<!-- 
+<!--
 versions = new Array();
 components = new Array();
 closedversions = new Array();
@@ -8,6 +8,9 @@
 closedversions['All'] = new Array(new Array('','All'));
 {project_js}
 
+// Saved queries
+savedQueries = new Array({section name=query loop=$queries}"{$queries[query].saved_query_name}"{if not $smarty.section.query.last},{/if}{/section});
+
 {literal}
 function updateMenus(f) {
   sel = f.projects[f.projects.selectedIndex].text;
@@ -22,10 +25,27 @@
     f.components.options[x].text = components[sel][x][1];
   }
 }
+
+function checkSavedQueries(frm) {
+	if (frm.savedqueryname.value != '') {
+		for (i = 0; i < savedQueries.length; i++) {
+			if (frm.savedqueryname.value == savedQueries[i]) {
+				if (confirm('Are you sure you want to override the saved query named "' + frm.savedqueryname.value + '"?')) {
+					frm.savedqueryoverride.value = 1;
+					return true;
+				} else {
+					return false;
+				}
+			}
+		}
+	}
+	return true;
+}
+
 {/literal}
 //-->
 </script>
-    <form method="get" action="query.php" name="query">
+    <form method="get" action="query.php" name="query" onSubmit="return checkSavedQueries(this)">
       <table>
 				<tr valign="baseline">
 					<td valign="top"><b>{$STRING.QUERY.Project}:</b></td>
@@ -87,9 +107,10 @@
 				{$STRING.QUERY.SaveThisQueryAs}: <input maxlength="40" type="text" name="savedqueryname">
 				<br><br>
 			{/if}
-      <input type="hidden" name="op" value="doquery">
+			<input type="hidden" name="op" value="doquery">
+			<input type="hidden" name="savedqueryoverride" value="0">
 			<input type="reset" value="{$STRING.QUERY.ResetBackToDefaultQuery}">
-			<input type="submit" value="{$STRING.QUERY.SubmitQuery}"> 
+			<input type="submit" value="{$STRING.QUERY.SubmitQuery}">
 			{if count($queries)}
 				<br><br>
 				<b>{$STRING.QUERY.SavedQueries}</b>

Index: queryform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- queryform.html	17 Jun 2002 09:21:53 -0000	1.17
+++ queryform.html	5 Nov 2002 20:43:50 -0000	1.18
@@ -1,5 +1,5 @@
 <script type="text/JavaScript">
-<!-- 
+<!--
 versions = new Array();
 closedversions = new Array();
 components = new Array();
@@ -8,6 +8,9 @@
 components['All'] = new Array(new Array('','All'));
 {project_js}
 
+// Saved queries
+savedQueries = new Array({section name=query loop=$queries}"{$queries[query].saved_query_name}"{if not $smarty.section.query.last},{/if}{/section});
+
 {literal}
 function updateMenus(f) {
   sel = f.projects[f.projects.selectedIndex].text;
@@ -22,10 +25,27 @@
     f.components.options[x].text = components[sel][x][1];
   }
 }
+
+function checkSavedQueries(frm) {
+	if (frm.savedqueryname.value != '') {
+		for (i = 0; i < savedQueries.length; i++) {
+			if (frm.savedqueryname.value == savedQueries[i]) {
+				if (confirm('Are you sure you want to override the saved query named "' + frm.savedqueryname.value + '"?')) {
+					frm.savedqueryoverride.value = 1;
+					return true;
+				} else {
+					return false;
+				}
+			}
+		}
+	}
+	return true;
+}
+
 {/literal}
 //-->
 </script>
-<form method="get" action="query.php" name="query">
+<form method="get" action="query.php" name="query" onSubmit="return checkSavedQueries(this)">
     <table>
 	<tr>
 	    <th align="left">{$STRING.QUERY.Status}:</th>
@@ -126,6 +146,7 @@
     </table>
     <hr align="left" width="100%">
     <input type="hidden" name="op" value="doquery">
+	<input type="hidden" name="savedqueryoverride" value="0">
     <b>{$STRING.QUERY.SortBy}:</b>
     <select name="order">
 	<option value="bug_id">{$STRING.QUERY.SortBy_BugNumber}</option>
@@ -145,7 +166,7 @@
     <br><br>
 {/if}
     <input type="reset" value="{$STRING.QUERY.ResetBackToDefaultQuery}">
-    <input type="submit" value="{$STRING.QUERY.SubmitQuery}"> 
+    <input type="submit" value="{$STRING.QUERY.SubmitQuery}">
 {if count($queries)}
     <br><br><b>{$STRING.QUERY.SavedQueries}</b><br>
     {section name=query loop=$queries}