[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. fdd44bf994948f3f1379f8802dd017f0ae225754

[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, rel_2_1 has been updated
       via  fdd44bf994948f3f1379f8802dd017f0ae225754 (commit)
      from  f0f9e63098245e8b591ed1091172f71c172d45d4 (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 fdd44bf994948f3f1379f8802dd017f0ae225754
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Fri Jun 17 01:27:11 2011 -0400

    in unified vol/copy editor disallow editing of item attributes when no copies except via templates
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.js b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
index 5512b36..b3155b7 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
@@ -65,12 +65,11 @@ function my_init() {
 
         if (xul_param('edit',{'modal_xulG':true}) == '1') { 
 
-            g.edit = true;
+            g.edit = false;
 
             if (g.copies.length > 0) { // When loaded in the unified interface, there may be no copies yet (from the volum/item creator) 
 
                 // Editor desired, but let's check permissions
-                g.edit = false;
 
                 try {
                     var check = g.network.simple_request(
@@ -114,11 +113,12 @@ function my_init() {
             if (g.edit) {
                 $('caption').setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.caption')); 
                 $('save').setAttribute('hidden','false'); 
-                g.retrieve_templates();
             } else {
                 $('top_nav').setAttribute('hidden','true');
             }
 
+            g.retrieve_templates();
+
         } else {
             $('top_nav').setAttribute('hidden','true');
         }
@@ -167,6 +167,10 @@ function my_init() {
             xulG.refresh_copy_editor = function() {
                 try {
                     g.copies = xulG.copies;
+                    g.edit = g.copies.length > 0;
+                    if (g.edit) {
+                        $('caption').setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.caption'));
+                    }
                     g.original_copies = js2JSON( g.copies );
                     g.hide_copy_notes_button();
                     for (var i = 0; i < g.applied_templates.length; i++) {

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

Summary of changes:
 .../xul/staff_client/server/cat/copy_editor.js     |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS