From 0d1dae82371c1dbd0e99c45a35c58c50c4a3f48f Mon Sep 17 00:00:00 2001
From: senator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 15 Nov 2010 18:28:25 +0000
Subject: [PATCH] Serials: two little things to make alt serials control
 interfaces less painful to use.

The copy template editor now gives dropdowns for fine level and loan duration.
This is particularly useful since at receive time, if you're trying to create
units, you can't do it with null values in those fields.

The caption and pattern pane of the subscription details interface now sets the
active checkbox to checked by default when creating new caption and patterns.
This helps prevent user confusion if you create a caption/pattern and move on
to the issuances tab and find that you can't apply the caption/pattern that
you just created because you didn't make it "active."



git-svn-id: svn://svn.open-ils.org/ILS/trunk@18745 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../js/ui/default/conify/global/asset/copy_template.js    |  6 ++++++
 .../default/conify/global/asset/copy_template.tt2         | 15 +++++++++++++++
 .../default/serial/subscription/caption_and_pattern.tt2   |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js b/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js
index b5e9d89d1..ff01590b8 100644
--- a/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js
+++ b/Open-ILS/web/js/ui/default/conify/global/asset/copy_template.js
@@ -25,6 +25,12 @@ function create_or_update_act(obj, opts, edit_pane) {
 }
 
 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(
diff --git a/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2 b/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
index 9b7cc4028..37a360d00 100644
--- a/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
+++ b/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
@@ -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 %]
diff --git a/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2 b/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2
index 5510cdf7c..3802d3d81 100644
--- a/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2
+++ b/Open-ILS/web/templates/default/serial/subscription/caption_and_pattern.tt2
@@ -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>
-- 
2.11.0