Attachment 289311 Details for Bug 424691 – Patch to disable use of ajax on first page load if no form data present

[patch] Patch to disable use of ajax on first page load if no form data present

no_ajax_first_load.patch (text/plain), 4.29 KB, created by David Lawrence on 2007-12-14 17:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lawrence

Created: 2007-12-14 17:56:52 UTC

Size: 4.29 KB

patch

obsolete

>Index: template/en/default/search/form_product_query_js.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/template/en/default/search/form_product_query_js.html.tmpl,v
>retrieving revision 1.4
>diff -u -r1.4 form_product_query_js.html.tmpl
>--- template/en/default/search/form_product_query_js.html.tmpl	15 Oct 2007 18:41:49 -0000	1.4
>+++ template/en/default/search/form_product_query_js.html.tmpl	14 Dec 2007 17:45:53 -0000
>@@ -28,11 +28,17 @@
> 
> [%# *** Product Component Version Milestone *** %]
> 
>+[% form_data_present = 0 %]
>+[% IF default.product.0 != "" %]
>+  [% form_data_present = 1 %]
>+[% END %]
>+
> <script type="text/javascript">
>-var urlbase = '[% Param('urlbase') %]'
>-var can_milestone = [% IF Param("usetargetmilestone") && UserInGroup('milestones') %]true[% ELSE %]false[% END %]
>-saved['component'] = ['[% default.component.join("','") %]']
>-saved['version'] = ['[% default.version.join("','") %]']
>+var urlbase               = '[% Param('urlbase') %]'
>+var can_milestone         = [% IF Param("usetargetmilestone") && UserInGroup('milestones') %]true[% ELSE %]false[% END %]
>+form_data_present         = [% form_data_present %]
>+saved['component']        = ['[% default.component.join("','") %]']
>+saved['version']          = ['[% default.version.join("','") %]']
> saved['target_milestone'] = ['[% default.target_milestone.join("','") %]']
> </script>
> 
>@@ -68,6 +74,13 @@
>   <b>Versions</b>
>   <div id="selversion">
>     <select name="version" id="version" multiple="multiple" size="7">
>+    [% IF NOT form_data_present %]
>+      [% FOREACH v = version %]
>+        <option value="[% v FILTER html %]"
>+          [% " selected" IF lsearch(default.version, v) != -1 %]>
>+          [% v FILTER html %]</option>
>+      [% END %]
>+    [% END %]
>     </select>
>   </div>
> </div>
>@@ -75,7 +88,15 @@
> <div id="outerComponent" style="margin: 8px; float: left;">
>   <b>Components</b>
>   <div id="selcomponent">
>-    <select name="component" id="component" multiple="multiple" size="7"></select>
>+    <select name="component" id="component" multiple="multiple" size="7">
>+    [% IF NOT form_data_present %]
>+      [% FOREACH c = component_ %]
>+        <option value="[% c FILTER html %]"
>+          [% " selected" IF lsearch(default.component, c) != -1 %]>
>+          [% c FILTER html %]</option>
>+      [% END %]
>+    [% END %]
>+    </select>
>   </div>
>   <a href="describecomponents.cgi">[Help]</a>
> </div>
>@@ -84,7 +105,15 @@
>   <div id="outerMilestone" style="margin: 8px; float: left;">
>     <b>Milestones</b> 
>     <div id="seltarget_milestone">
>-      <select name="target_milestone" id="target_milestone" multiple="multiple" size="7"></select>
>+      <select name="target_milestone" id="target_milestone" multiple="multiple" size="7">
>+      [% IF NOT form_data_present %]
>+      [% FOREACH m = target_milestone %]
>+        <option value="[% m FILTER html %]"
>+          [% " selected" IF lsearch(default.component, m) != -1 %]>
>+          [% m FILTER html %]</option>
>+      [% END %]
>+    [% END %]
>+      </select>
>     </div>
>   </div>
> [% END %]
>Index: js/product_query.js
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/js/product_query.js,v
>retrieving revision 1.2
>diff -u -r1.2 product_query.js
>--- js/product_query.js	15 Oct 2007 18:41:49 -0000	1.2
>+++ js/product_query.js	14 Dec 2007 17:45:53 -0000
>@@ -1,6 +1,8 @@
>-var urlbase          = ""
>-var can_milestone    = ""
>-var single_product   = ""
>+var urlbase           = ""
>+var can_milestone     = ""
>+var single_product    = ""
>+var first_load        = 1
>+var form_data_present = 0
> var saved                 = new Array()
> saved['product']          = new Array()
> saved['version']          = new Array()
>@@ -24,12 +26,20 @@
> }
> 
> function updateSelectAll(add_all) {
>+    if ( form_data_present == 0 && first_load == 1 ) {
>+        first_load = 0
>+        return true
>+    }
>     updateSelect('getComponents', 'component', add_all)
>     updateSelect('getVersions', 'version', add_all)
>     updateSelect('getMilestones', 'target_milestone', add_all)
> }
> 
> function updateSelect(func, field, add_all) {
>+    if ( form_data_present == 0 && first_load == 1 ) {
>+        first_load = 0
>+        return true
>+    }
>     var products = ''
>     if ( field != 'product' ) {
>         products = findProducts()

Actions: View | Diff

Attachments on bug 424691: 289311