From 1612e8fd7a2d94c1ceeb17a955914c81c645055e Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 21 May 2008 14:44:04 +0000 Subject: [PATCH] Merged revisions 9641-9642,9649-9650,9652 via svnmerge from svn://svn.open-ils.org/ILS/trunk ........ r9641 | miker | 2008-05-19 14:01:23 -0400 (Mon, 19 May 2008) | 1 line simple xslt (with embeded usage info) for extracting perms from the IDL permacrud definitions ........ r9642 | miker | 2008-05-19 14:17:07 -0400 (Mon, 19 May 2008) | 1 line script to find new perms from permacrud that are not in the permission seed data yet ........ r9649 | dbs | 2008-05-20 23:42:34 -0400 (Tue, 20 May 2008) | 8 lines Patch from Craig Ricciuto: opac.xul changes: * Finished converting JavaScript strings cat.properties changes: * Added the strings from opac.xul ........ r9650 | dbs | 2008-05-21 00:23:02 -0400 (Wed, 21 May 2008) | 16 lines i18n patch from Craig Ricciuto: Changes for record_buckets.xul: - converted hard-coded strings in the JavaScript to be stored in the DTD. - No XML strings to change. Changes for record_buckets.js: - Removed trailing commas in places - Converted all hard-coded strings to use JavaScript from the .properties file(s) Changes for cat.properties: - Added the property string names/values from record_buckets.js/.xul Changes for common.properties: - Added a common string that appear multiple times in record_buckets.js to here. ........ r9652 | dbs | 2008-05-21 10:30:54 -0400 (Wed, 21 May 2008) | 7 lines i18n patch from Craig Ricciuto (Laurentian University): opac.xul: Converted a string that was missed record_buckets.js: Converted a string that was missed cat.properties: Added the variables and values for the missed strings from above files ........ git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9653 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/extract-IDL-permissions.xsl | 39 +++++++ Open-ILS/src/extras/reconcile-perms.sh | 17 +++ Open-ILS/xul/staff_client/server/cat/opac.xul | 19 ++-- .../xul/staff_client/server/cat/record_buckets.js | 118 +++++++++++++-------- .../xul/staff_client/server/cat/record_buckets.xul | 11 +- .../server/locale/en-US/cat.properties | 45 ++++++++ .../server/locale/en-US/common.properties | 1 + 7 files changed, 191 insertions(+), 59 deletions(-) create mode 100644 Open-ILS/examples/extract-IDL-permissions.xsl create mode 100755 Open-ILS/src/extras/reconcile-perms.sh diff --git a/Open-ILS/examples/extract-IDL-permissions.xsl b/Open-ILS/examples/extract-IDL-permissions.xsl new file mode 100644 index 0000000000..65fbb97b44 --- /dev/null +++ b/Open-ILS/examples/extract-IDL-permissions.xsl @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Open-ILS/src/extras/reconcile-perms.sh b/Open-ILS/src/extras/reconcile-perms.sh new file mode 100755 index 0000000000..27764f9b31 --- /dev/null +++ b/Open-ILS/src/extras/reconcile-perms.sh @@ -0,0 +1,17 @@ +#!/bin/bash +pushd . >/dev/null 2>/dev/null +cd `dirname $0` + +xsltproc ../../examples/extract-IDL-permissions.xsl ../../examples/fm_IDL.xml|perl -e 'while(<>){s/^\s+(.*)\s+$/$1/o;print("$1\n")unless(/^\s*$/ || /\s+/)}'|sort -u > /tmp/oils_permacrud_perm_list +grep -A1 perm_list ../sql/Pg/950.data.seed-values.sql|grep "'"|cut -f2 -d"'"|sort -u > /tmp/oils_sql_perm_list + +echo "New permissions from permacrud:" +echo + +diff -pu /tmp/oils_sql_perm_list /tmp/oils_permacrud_perm_list |grep '^+'|cut -f2 -d'+'|grep -v '^$' + +echo + +popd >/dev/null 2>/dev/null + + diff --git a/Open-ILS/xul/staff_client/server/cat/opac.xul b/Open-ILS/xul/staff_client/server/cat/opac.xul index e282de0125..954bc5bf92 100644 --- a/Open-ILS/xul/staff_client/server/cat/opac.xul +++ b/Open-ILS/xul/staff_client/server/cat/opac.xul @@ -32,6 +32,8 @@ + + + + diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.js b/Open-ILS/xul/staff_client/server/cat/record_buckets.js index 1bf13c656a..f1a6645d5e 100644 --- a/Open-ILS/xul/staff_client/server/cat/record_buckets.js +++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.js @@ -1,5 +1,7 @@ dump('entering cat.record_buckets.js\n'); +function $(id) { return document.getElementById(id); } + if (typeof cat == 'undefined') cat = {}; cat.record_buckets = function (params) { @@ -18,7 +20,7 @@ cat.record_buckets.pick_file = function (defaultFileName) { var nsIFilePicker = Components.interfaces.nsIFilePicker; var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance( nsIFilePicker ); - fp.init( window, "Save File As", nsIFilePicker.modeSave ); + fp.init( window, $("catStrings").getString('staff.cat.record_buckets.save_file_as'), nsIFilePicker.modeSave ); if (defaultFileName) fp.defaultString = defaultFileName; @@ -60,11 +62,11 @@ cat.record_buckets.export_records = function(obj, output_type) { if (file) { persist.saveURI(uri,null,null,null,null,file); } else { - alert("File not downloaded."); + alert( $("catStrings").getString('staff.cat.record_buckets.export_records.alert') ); } } catch(E) { - obj.error.standard_unexpected_error_alert('Records could not be exported.',E); + obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.export_records.std_unexpected_error'), E); } }; @@ -79,7 +81,7 @@ cat.record_buckets.prototype = { if (this.first_pause) { this.first_pause = false; } else { - alert("Action completed."); + alert( $("commonStrings").getString('common.action_complete')); } var obj = this; obj.list1.clear(); @@ -104,7 +106,7 @@ cat.record_buckets.prototype = { 'publisher' : { 'hidden' : false }, 'pubdate' : { 'hidden' : false }, 'isbn' : { 'hidden' : false }, - 'tcn' : { 'hidden' : false }, + 'tcn' : { 'hidden' : false } } ); @@ -122,7 +124,8 @@ cat.record_buckets.prototype = { if (typeof params.on_retrieve == 'function') { params.on_retrieve(row); } } catch(E) { - obj.error.standard_unexpected_error_alert('Error retrieving mvr for record with id =' + row.my.docid, E); + obj.error.standard_unexpected_error_alert( + $("catStrings").getFormattedString('staff.cat.record_buckets.retrieve_row.std_unexpected_error', [row.my.docid]), E); } } ); @@ -156,7 +159,7 @@ cat.record_buckets.prototype = { } catch(E) { alert('FIXME: ' + E); } - }, + } } ); @@ -185,7 +188,7 @@ cat.record_buckets.prototype = { } catch(E) { alert('FIXME: ' + E); } - }, + } } ); @@ -218,7 +221,7 @@ cat.record_buckets.prototype = { } catch(E) { alert('FIXME: ' + E); } - }, + } } ); @@ -273,10 +276,13 @@ cat.record_buckets.prototype = { [ ses(), obj.data.list.au[0].id() ] ); if (typeof buckets.ilsevent != 'undefined') { - obj.error.standard_unexpected_error_alert('Could not retrieve your buckets.',buckets); + obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.buckets.std_unexpected_error'), buckets); return; } - var items = [ ['Choose a bucket...',''], ['Retrieve shared bucket...',-1] ].concat( + var items = [ + [$("catStrings").getString('staff.cat.record_buckets.menulist_placeholder.item1'),''], + [$("catStrings").getString('staff.cat.record_buckets.menulist_placeholder.item2'),-1] + ].concat( util.functional.map_list( util.functional.filter_list( buckets.biblio, @@ -308,7 +314,7 @@ cat.record_buckets.prototype = { function change_bucket(ev) { var bucket_id = ev.target.value; if (bucket_id < 0 ) { - bucket_id = window.prompt('Enter bucket number:'); + bucket_id = window.prompt($("catStrings").getString('staff.cat.record_buckets.change_bucket.bucket_id')); ev.target.value = bucket_id; ev.target.setAttribute('value',bucket_id); } @@ -332,7 +338,7 @@ cat.record_buckets.prototype = { if (bucket.ilsevent == 1506 /* CONTAINER_NOT_FOUND */) { alert('Could not find a bucket with ID = ' + bucket_id); } else { - obj.error.standard_unexpected_error_alert('Error retrieving bucket. Did you use a valid bucket id?',bucket); + obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.change_bucket.error'),bucket); } return; } @@ -505,7 +511,7 @@ cat.record_buckets.prototype = { alert(js2JSON(E)); } } - alert("Action completed."); + alert( $("commonStrings").getString('common.action_complete')); setTimeout( function() { JSAN.use('util.widgets'); @@ -520,12 +526,12 @@ cat.record_buckets.prototype = { try { var bucket = obj.controller.view.bucket_menulist.value; var name = obj.bucket_id_name_map[ bucket ]; - var conf = window.confirm('Delete the bucket named ' + name + '?'); + var conf = window.confirm($("catStrings").getFormattedString('staff.cat.record_buckets.delete_bucket_named', [name])); if (!conf) return; obj.list2.clear(); var robj = obj.network.simple_request('BUCKET_DELETE',[ses(),'biblio',bucket]); if (typeof robj == 'object') throw robj; - alert("Action completed."); + alert( $("commonStrings").getString('common.action_complete')); var x = document.getElementById('info_box'); x.setAttribute('hidden','true'); obj.controller.view.cmd_record_buckets_delete_bucket.setAttribute('disabled','true'); @@ -544,7 +550,7 @@ cat.record_buckets.prototype = { ); } catch(E) { - alert('FIXME -- ' + E); + alert('FIXME: ' + E); } } ], @@ -552,7 +558,11 @@ cat.record_buckets.prototype = { ['command'], function() { try { - var name = prompt('What would you like to name the bucket?','','Bucket Creation'); + var name = prompt( + $("catStrings").getString('staff.cat.record_buckets.new_bucket.bucket_prompt'), + '', + $("catStrings").getString('staff.cat.record_buckets.new_bucket.bucket_prompt_title') + ); if (name) { var bucket = new cbreb(); @@ -564,14 +574,13 @@ cat.record_buckets.prototype = { if (typeof robj == 'object') { if (robj.ilsevent == 1710 /* CONTAINER_EXISTS */) { - alert('You already have a bucket with that name.'); + alert($("catStrings").getString('staff.cat.record_buckets.new_bucket.same_name_alert')); return; } throw robj; } - - alert('Bucket "' + name + '" created.'); + alert($("catStrings").getFormattedString('staff.cat.record_buckets.new_bucket.bucket_created', [name])); obj.controller.render('record_buckets_menulist_placeholder'); obj.controller.view.bucket_menulist.value = robj; @@ -635,16 +644,21 @@ cat.record_buckets.prototype = { netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite'); var top_xml = ''; - top_xml += 'Merge these records? (Select the "lead" record first)'; - top_xml += '