[open-ils-commits] r18746 - in branches/rel_2_0/Open-ILS/web: js/ui/default/conify/global/asset templates/default/conify/global/asset templates/default/serial/subscription (senator)

[svn at svn.open-ils.org]

Author: senator
Date: 2010-11-15 13:30:16 -0500 (Mon, 15 Nov 2010)
New Revision: 18746

Modified:
   branches/rel_2_0/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js
   branches/rel_2_0/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
   branches/rel_2_0/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2
Log:
Backport r18745 from trunk: serials ease-of-use issues

It's comical how near a miss this commit is to making it into beta2, but it's
fairly minor stuff.


Modified: branches/rel_2_0/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js	2010-11-15 18:28:25 UTC (rev 18745)
+++ branches/rel_2_0/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js	2010-11-15 18:30:16 UTC (rev 18746)
@@ -25,6 +25,12 @@
 }
 
 function actInit() {
+    actGrid.overrideEditWidgets.fine_level = special_fine_level;
+    actGrid.overrideEditWidgets.fine_level.shove = {"create": 2};
+
+    actGrid.overrideEditWidgets.loan_duration = special_loan_duration;
+    actGrid.overrideEditWidgets.loan_duration.shove = {"create": 2};
+
     pcrud = new openils.PermaCrud();
 
     new openils.User().buildPermOrgSelector(

Modified: branches/rel_2_0/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2	2010-11-15 18:28:25 UTC (rev 18745)
+++ branches/rel_2_0/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2	2010-11-15 18:30:16 UTC (rev 18746)
@@ -33,5 +33,20 @@
         editPaneOnSubmit="create_or_update_act"
         editOnEnter="true">
     </table>
+    <div class="hidden">
+        <!-- these FilteringSelects will be attached manually to actGrid -->
+        <select required="false" dojoType="dijit.form.FilteringSelect"
+            jsId="special_fine_level">
+            <option value="1">Low</option>
+            <option value="2">Normal</option>
+            <option value="3">High</option>
+        </select>
+        <select required="false" dojoType="dijit.form.FilteringSelect"
+            jsId="special_loan_duration">
+            <option value="1">Short</option>
+            <option value="2">Normal</option>
+            <option value="3">Long</option>
+        </select>
+    </div>
 </div>
 [% END %]

Modified: branches/rel_2_0/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2	2010-11-15 18:28:25 UTC (rev 18745)
+++ branches/rel_2_0/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2	2010-11-15 18:30:16 UTC (rev 18746)
@@ -31,7 +31,7 @@
                     <span control="true"></span>
                 </td>
                 <td name="active">
-                    <input type="checkbox" control="true" />
+                    <input type="checkbox" control="true" checked="checked" />
                 </td>
                 <td name="remover">
                     <button>X</button>