[open-ils-commits] [GIT] Evergreen ILS branch master updated. 07deed5b4a5f5e915bbfafd4417642fcfd0eeab4

[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  07deed5b4a5f5e915bbfafd4417642fcfd0eeab4 (commit)
      from  17c9ebd5d6d3548b23693c544d0ec1d94928d03f (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 07deed5b4a5f5e915bbfafd4417642fcfd0eeab4
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Fri Sep 16 12:45:11 2011 -0400

    Add Show In Catalog button to Z39.50 Import.
    
    Changes to z3950.xul:
    Add show_in_catalog command.
    Add button next to Mark for Overlay button.
    
    Changes to z3950.js:
    Enable/disable Show In Catalog button whenever Mark for Overlay
    button is enabled/disabled.
    Add code for show_in_catalog to open the record detail screen in
    a new tab.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index ac3e712..a7da8d7 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -73,9 +73,11 @@ cat.z3950.prototype = {
                                     }
                                     if (o.getAttribute('service') == 'native-evergreen-catalog') {
                                         $('mark_overlay_btn').disabled = false;
+                                        $('show_in_catalog_btn').disabled = false;
                                         obj.controller.view.mark_overlay.setAttribute('doc_id',o.getAttribute('doc_id'));
                                     } else {
                                         $('mark_overlay_btn').disabled = true;
+                                        $('show_in_catalog_btn').disabled = true;
                                     }
                                     return o.getAttribute('retrieve_id');
                                 }
@@ -176,6 +178,29 @@ cat.z3950.prototype = {
                                 }
                             }
                         ],
+                        'show_in_catalog' : [
+                            ['command'],
+                            function() {
+                                try {
+                                    var doc_id = obj.controller.view.mark_overlay.getAttribute('doc_id');
+                                    if (doc_id) {
+                                        var opac_url = xulG.url_prefix( urls.opac_rdetail ) + doc_id;
+                                        var content_params = { 
+                                            'session' : ses(),
+                                            'authtime' : ses('authtime'),
+                                            'opac_url' : opac_url,
+                                        };
+                                        xulG.new_tab(
+                                                     xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
+                                                     {'tab_name': $("catStrings").getString('staff.cat.z3950.replace_tab_with_opac.tab_name')}, 
+                                                     content_params
+                                                     );
+                                    }
+                                } catch(E) {
+                                    alert('Error in z3950.js, show_in_catalog: ' + E);
+                                }
+                            }
+                        ],
                         'marc_import' : [
                             ['command'],
                             function() {
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index 2a30095..32f9a9e 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.xul
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.xul
@@ -86,6 +86,7 @@
         <command id="cmd_z3950_csv_to_file" disabled="true" />
         <command id="save_columns" />
         <command id="mark_overlay" />
+        <command id="show_in_catalog" />
         <command id="toggle_form" />
         <command id="marc_view" />
     </commandset>
@@ -187,6 +188,11 @@
                         disabled="true"
                         label="&staff.cat.z3950.mark_overlay.label;"
                         accesskey="&staff.cat.z3950.mark_overlay.accesskey;"/>
+                    <button id="show_in_catalog_btn"
+                        command="show_in_catalog"
+                        disabled="true"
+                        label="&staff.server.admin.transit.list.show.label;"
+                        accesskey="&staff.server.admin.transit.list.show.accesskey;"/>
                     <spacer flex="1"/>
                     <button id="marc_view_btn" command="marc_view" disabled="true"/>
                     <checkbox id="marc_editor" label="&staff.cat.z3950.marc_editor.label;" accesskey="&staff.cat.z3950.marc_editor.accesskey;" oils_persist="checked" checked="true"/> 

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

Summary of changes:
 Open-ILS/xul/staff_client/server/cat/z3950.js  |   25 ++++++++++++++++++++++++
 Open-ILS/xul/staff_client/server/cat/z3950.xul |    6 +++++
 2 files changed, 31 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS