[open-ils-commits] r15357 - in branches/rel_1_6_0/Open-ILS: web/js/dojo/openils web/js/dojo/openils/widget web/js/ui/default/acq/common web/js/ui/default/vandelay xul/staff_client/server/cat xul/staff_client/server/locale/en-US (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Jan 21 12:03:03 EST 2010
Author: phasefx
Date: 2010-01-21 12:03:00 -0500 (Thu, 21 Jan 2010)
New Revision: 15357
Modified:
branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/GridColumnPicker.js
branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
branches/rel_1_6_0/Open-ILS/web/js/ui/default/acq/common/li_table.js
branches/rel_1_6_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js
branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/copy_editor.js
branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/marc_new.xul
branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/util.js
branches/rel_1_6_0/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Log:
Backport changesets 15235, 15265, 15269, 15270:
removes some "speedbump" dialog boxes
fixes dojo column picker
fixes checkbox in vandelay queues
fixes marc editor in acquisitions
Modified: branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/GridColumnPicker.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/GridColumnPicker.js 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/GridColumnPicker.js 2010-01-21 17:03:00 UTC (rev 15357)
@@ -30,7 +30,7 @@
this.dialog = dialog;
this.grid = grid;
this.structure = structure;
- this.dialogTable = dialog.domNode.getElementsByTagName('tbody')[0];
+ this.dialogTable = dialog.containerNode.getElementsByTagName('tbody')[0];
this.baseCellList = this.structure[0].cells[0].slice();
this.build();
this.grid.model.fields.get(0).sort = false;
Modified: branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js 2010-01-21 17:03:00 UTC (rev 15357)
@@ -36,7 +36,7 @@
this.structure = structure;
if(!structure)
this.structure = this.grid.attr('structure');
- this.dialogTable = this.dialog.domNode.getElementsByTagName('tbody')[0];
+ this.dialogTable = this.dialog.containerNode.getElementsByTagName('tbody')[0];
this.baseCellList = this.structure[0].cells[0].slice();
this.build();
this.authtoken = authtoken;
@@ -61,7 +61,7 @@
"<thead><tr><th width='33%'>Column</th><th width='33%'>Display</th><th width='33%'>Auto Width</th></tr></thead>" +
"<tbody><tr><td><div name='cancel_button'/></td><td><div name='save_button'/></td></tr></tbody></table>" });
- dialog.domNode.appendChild(table);
+ dialog.containerNode.appendChild(table);
var button = new dijit.form.Button({label:'Save'}, dojo.query('[name=save_button]', table)[0]);
button.onClick = function() { dialog.hide(); self.update(true); };
Modified: branches/rel_1_6_0/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-01-21 17:03:00 UTC (rev 15357)
@@ -919,30 +919,29 @@
if(openils.XUL.isXUL()) {
win = window.open('/xul/' + openils.XUL.buildId() + '/server/cat/marcedit.xul');
} else {
-
win = window.open('/xul/server/cat/marcedit.xul');
- var self = this;
- win.xulG = {
- record : {marc : li.marc()},
- save : {
- label: 'Save Record', // XXX I18N
- func: function(xmlString) {
- li.marc(xmlString);
- fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.lineitem.update'],
- { async: true,
- params: [openils.User.authtoken, li],
- oncomplete: function(r) {
- openils.Util.readResponse(r);
- win.close();
- self.drawInfo(li.id())
- }
- }
- );
- },
- }
- };
}
+ var self = this;
+ win.xulG = {
+ record : {marc : li.marc()},
+ save : {
+ label: 'Save Record', // XXX I18N
+ func: function(xmlString) {
+ li.marc(xmlString);
+ fieldmapper.standardRequest(
+ ['open-ils.acq', 'open-ils.acq.lineitem.update'],
+ { async: true,
+ params: [openils.User.authtoken, li],
+ oncomplete: function(r) {
+ openils.Util.readResponse(r);
+ win.close();
+ self.drawInfo(li.id())
+ }
+ }
+ );
+ },
+ }
+ };
}
this._savePl = function(values) {
Modified: branches/rel_1_6_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js 2010-01-21 17:03:00 UTC (rev 15357)
@@ -735,7 +735,7 @@
function vlQueueGridFormatSelectBox(id) {
var domId = 'vl-record-list-selected-' + id;
- selectableGridRecords[domId] = id;
+ if (id) { selectableGridRecords[domId] = id; }
return "<div><input type='checkbox' id='"+domId+"'/></div>";
}
Modified: branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/copy_editor.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/copy_editor.js 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/copy_editor.js 2010-01-21 17:03:00 UTC (rev 15357)
@@ -1225,8 +1225,6 @@
);
if (typeof r.ilsevent != 'undefined') {
g.error.standard_unexpected_error_alert('copy update',r);
- } else {
- alert($('catStrings').getString('staff.cat.copy_editor.handle_update.success'));
}
/* FIXME -- revisit the return value here */
} catch(E) {
Modified: branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/marc_new.xul
===================================================================
--- branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/marc_new.xul 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/marc_new.xul 2010-01-21 17:03:00 UTC (rev 15357)
@@ -107,7 +107,6 @@
[ ses(), new_marcxml, catStrings.getString('staff.cat.marc_new.system_local.label'), 1 ]
);
if (typeof robj.ilsevent != 'undefined') throw(robj);
- alert(catStrings.getString('staff.cat.marc_new.record_created.label'));
/* Replace tab with OPAC-view of record */
Modified: branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/util.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/util.js 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/xul/staff_client/server/cat/util.js 2010-01-21 17:03:00 UTC (rev 15357)
@@ -273,7 +273,6 @@
params
);
if (!my_xulG.copies && params.edit) {
- alert(typeof params.no_copies_modified_msg != 'undefined' ? params.no_copies_modified_msg : $("catStrings").getString('staff.cat.util.copy_editor.not_modified'));
} else {
return my_xulG.copies;
}
Modified: branches/rel_1_6_0/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
===================================================================
--- branches/rel_1_6_0/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties 2010-01-21 16:47:41 UTC (rev 15356)
+++ branches/rel_1_6_0/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties 2010-01-21 17:03:00 UTC (rev 15357)
@@ -137,7 +137,6 @@
staff.cat.copy_editor.apply.label=Apply
staff.cat.copy_editor.apply.accesskey=A
staff.cat.copy_editor.cancel.label=Cancel
-staff.cat.copy_editor.handle_update.success=Items were added or modified.
staff.cat.copy_editor.handle_update.error=copy update error:
staff.cat.copy_editor.add_stat_cat.error=Error adding statistical category to display definition
staff.cat.copy_editor.populate_stat_cat.error=Error populating statistical categories for display
@@ -236,7 +235,6 @@
staff.cat.marc_new.tab_name=MARC Template
staff.cat.marc_new.create_record.label=Create Record
staff.cat.marc_new.system_local.label=System Local
-staff.cat.marc_new.record_created.label=Record created.
staff.cat.marc_new.retrieving.label=Retrieving title...
staff.cat.marc_new.creating_record.error=Error creating MARC record.
staff.cat.marc_new.loading_template.error=Error loading MARC template: %1$s
@@ -331,7 +329,6 @@
staff.cat.util.copy_editor.batch_view=Batch View
staff.cat.util.copy_editor.edit=Edit
staff.cat.util.copy_editor.view=View
-staff.cat.util.copy_editor.not_modified=Copies not modified.
staff.cat.util.mark_item_damaged.af_message=Action failed. One or more of these items is in a special status such as "Checked Out" or "In Transit" and cannot be changed to the Damaged status.
staff.cat.util.mark_item_damaged.af_title=Action failed.
staff.cat.util.mark_item_damaged.af_ok_label=OK
More information about the open-ils-commits
mailing list