[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6ebb789434cb554ce1036d92a4dded3ecf23b989

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  6ebb789434cb554ce1036d92a4dded3ecf23b989 (commit)
      from  4922474d703b12021d755957afcffa6c75dbe28e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ebb789434cb554ce1036d92a4dded3ecf23b989
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Wed Nov 16 15:19:18 2011 -0500

    Serials: be less eager to offer season dropdown in holding code mini-wizard
    
    The recent commit (ebce79a288b in master) to make the holding code
    mini-wizard offer a dropdown for season offers it too often, sometimes
    in completely inappropriate cases.
    
    This commit gets it right, and incidentally fixes two totally broken
    links elsewhere in alternate serials control view interfaces.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/web/js/dojo/openils/widget/HoldingCode.js b/Open-ILS/web/js/dojo/openils/widget/HoldingCode.js
index 7d8aa09..b26cb2b 100644
--- a/Open-ILS/web/js/dojo/openils/widget/HoldingCode.js
+++ b/Open-ILS/web/js/dojo/openils/widget/HoldingCode.js
@@ -55,7 +55,7 @@ if (!dojo._hasResource["openils.widget.HoldingCode"]) {
             var value = pattern_code[i + 1];
 
             if (_needed_fields.indexOf(subfield) != -1)
-                fields.push({"subfield": subfield, "caption": value});
+                fields.push({"subfield": subfield, "caption": value, "pattern_value": value});
         }
 
         if (!fields.length) {
@@ -71,9 +71,9 @@ if (!dojo._hasResource["openils.widget.HoldingCode"]) {
         dojo.create("td", {"innerHTML": field.caption}, tr);
 
         /* Any more special cases than this and we should switch to a dispatch
-         * table or somethingl. */
+         * table or something. */
         var input;
-        if (field.subfield == "j") {
+        if (field.pattern_value.match(/season/)) {
             input = new dijit.form.FilteringSelect(
                 {
                     "name": field.subfield,
diff --git a/Open-ILS/web/js/ui/default/serial/list_item.js b/Open-ILS/web/js/ui/default/serial/list_item.js
index 8455c82..c4c7654 100644
--- a/Open-ILS/web/js/ui/default/serial/list_item.js
+++ b/Open-ILS/web/js/ui/default/serial/list_item.js
@@ -28,7 +28,7 @@ function load_siss_display() {
                     var link = dojo.byId("siss_label_here");
                     link.onclick = function() {
                         location.href = oilsBasePath +
-                            "/eg/serial/subscription?id=" +
+                            "/serial/subscription?id=" +
                             r.subscription() + "&tab=issuances";
                     }
                     link.innerHTML = r.label();
diff --git a/Open-ILS/web/js/ui/default/serial/list_stream.js b/Open-ILS/web/js/ui/default/serial/list_stream.js
index 403b317..79bf05d 100644
--- a/Open-ILS/web/js/ui/default/serial/list_stream.js
+++ b/Open-ILS/web/js/ui/default/serial/list_stream.js
@@ -36,7 +36,7 @@ function load_sdist_display() {
                     var link = dojo.byId("sdist_label_here");
                     link.onclick = function() {
                         location.href = oilsBasePath +
-                            "/eg/serial/subscription?id=" +
+                            "/serial/subscription?id=" +
                             r.subscription() + "&tab=distributions";
                     }
                     link.innerHTML = r.label();

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/dojo/openils/widget/HoldingCode.js |    6 +++---
 Open-ILS/web/js/ui/default/serial/list_item.js     |    2 +-
 Open-ILS/web/js/ui/default/serial/list_stream.js   |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS