[open-ils-commits] r19020 - branches/rel_2_0/Open-ILS/web/js/ui/default/cat/authority (dbs)
svn at svn.open-ils.org
svn at svn.open-ils.org
Sun Dec 19 21:25:18 EST 2010
Author: dbs
Date: 2010-12-19 21:25:16 -0500 (Sun, 19 Dec 2010)
New Revision: 19020
Modified:
branches/rel_2_0/Open-ILS/web/js/ui/default/cat/authority/list.js
Log:
Display the tag and indicators for authority records in the merge box
Also, avoid the risk of creating or stomping on global variables by
using 'var' to declare our variables.
Also, apply copyright statement for the International Institute of
Social History. Thanks for sponsoring this contribution to Evergreen!
Modified: branches/rel_2_0/Open-ILS/web/js/ui/default/cat/authority/list.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/js/ui/default/cat/authority/list.js 2010-12-20 02:21:32 UTC (rev 19019)
+++ branches/rel_2_0/Open-ILS/web/js/ui/default/cat/authority/list.js 2010-12-20 02:25:16 UTC (rev 19020)
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2010 Internationaal Instituut voor Sociale Geschiedenis <info at iisg.nl>
+ * Dan Scott <dan at coffeecode.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
dojo.require('dijit.form.Button');
dojo.require('dijit.form.DropDownButton');
dojo.require('dijit.form.FilteringSelect');
@@ -34,28 +49,34 @@
var idArr = [];
// Grab each record from the returned authority records
dojo.query("record", data).forEach(function(node) {
- authText = '';
- authId = 0;
+ var auth = {};
+ auth.text = '';
+ auth.id = 0;
// Grab each authority record field from the authority record
dojo.query("datafield[tag^='1']", node).forEach(function(dfNode) {
- authText += dojox.xml.parser.textContent(dfNode);
+ auth.text += dojox.xml.parser.textContent(dfNode);
+ auth.name = dojo.attr(dfNode, 'tag');
+ auth.ind1 = dojo.attr(dfNode, 'ind1');
+ auth.ind2 = dojo.attr(dfNode, 'ind2');
});
+
+
// Grab the ID of the authority record
dojo.query("datafield[tag='901'] subfield[code='c']", node).forEach(function(dfNode) {
- authId = dojox.xml.parser.textContent(dfNode);
+ auth.id = dojox.xml.parser.textContent(dfNode);
});
- idArr.push(parseInt(authId));
+ idArr.push(parseInt(auth.id));
// Create the authority record listing entry
- dojo.place('<div class="authEntry" id="auth' + authId + '"><span class="text" id="authLabel' + authId + '">' + authText + '</span></div>', "authlist-div", "last");
+ dojo.place('<div class="authEntry" id="auth' + auth.id + '"><span class="text" id="authLabel' + auth.id + '">' + auth.text + '</span></div>', "authlist-div", "last");
// Add the menu of new/edit/delete/mark-for-merge options
var auth_menu = new dijit.Menu({});
// "Edit" menu item
- new dijit.MenuItem({"id": "edit_" + authId, "onClick": function(){
+ new dijit.MenuItem({"id": "edit_" + auth.id, "onClick": function(){
recId = this.id.slice(this.id.lastIndexOf('_') + 1);
pcrud = new openils.PermaCrud();
auth_rec = pcrud.retrieve("are", recId);
@@ -65,11 +86,11 @@
}, "label":"Edit"}).placeAt(auth_menu, "first");
// "Merge" menu item
- new dijit.MenuItem({"id": "merge_" + authId, "onClick":function(){
- authText = '';
+ new dijit.MenuItem({"id": "merge_" + auth.id, "onClick":function(){
+ auth.text = '';
recId = this.id.slice(this.id.lastIndexOf('_') + 1);
dojo.query('#auth' + recId + ' span.text').forEach(function(node) {
- authText += dojox.xml.parser.textContent(node);
+ auth.text += dojox.xml.parser.textContent(node);
});
// If there is a toMerge item already, this is a target record
@@ -80,12 +101,14 @@
} else {
mergeRole += 'Master</td>';
}
- dojo.place('<tr class="toMerge" id="toMerge_' + recId + '">' + mergeRole + '<td style="border: 1px solid black; padding-left: 1em;">' + authText + '</td></tr>', 'mergebox-tbody', 'last');
+
+ dojo.place('<tr class="toMerge" id="toMerge_' + recId + '"><td>' + mergeRole + '</td><td style="border: 1px solid black;" id="mergeMeta_' + recId + '"></td><td style="border: 1px solid black; padding-left: 1em; padding-right: 1em;" >' + auth.text + '</td></tr>', 'mergebox-tbody', 'last');
+ dojo.place('<span class="authmeta" style="font-family: monospace;">' + auth.name + ' ' + auth.ind1 + auth.ind2 + '</span>', 'mergeMeta_' + recId, 'last');
dojo.removeClass('mergebox-div', 'hidden');
}, "label":"Mark for Merge"}).placeAt(auth_menu, "last");
// "Delete" menu item
- new dijit.MenuItem({"id": "delete_" + authId, "onClick":function(){
+ new dijit.MenuItem({"id": "delete_" + auth.id, "onClick":function(){
recId = this.id.slice(this.id.lastIndexOf('_') + 1);
// Deleting an authority record is unusual; let's be 100% sure
@@ -101,8 +124,8 @@
}
}, "label":"Delete"}).placeAt(auth_menu, "last");
- auth_mb = new dijit.form.DropDownButton({dropDown: auth_menu, label:"Actions", id:"menu" + authId});
- auth_mb.placeAt("auth" + authId, "first");
+ auth_mb = new dijit.form.DropDownButton({dropDown: auth_menu, label:"Actions", id:"menu" + auth.id});
+ auth_mb.placeAt("auth" + auth.id, "first");
auth_menu.startup();
});
@@ -164,9 +187,9 @@
}
function authListInit() {
- term = cgi.param('authTerm') || '';
- page = cgi.param('authPage') || 0;
- axis = cgi.param('authAxis') || 'authority.author';
+ var term = cgi.param('authTerm') || '';
+ var page = cgi.param('authPage') || 0;
+ var axis = cgi.param('authAxis') || 'authority.author';
if (axis) {
dijit.byId('authAxis').attr('value', axis);
}
@@ -224,12 +247,12 @@
}
/* Clear out the current contents of the page */
- widgets = dijit.findWidgets(dojo.byId('authlist-div'));
+ var widgets = dijit.findWidgets(dojo.byId('authlist-div'));
dojo.forEach(widgets, function(w) { w.destroyRecursive(true); });
dojo.query("#authlist-div div").orphan();
- url = '/opac/extras/startwith/marcxml/'
+ var url = '/opac/extras/startwith/marcxml/'
+ dijit.byId('authAxis').attr('value')
// + '/' + dijit.byId('authOU').attr('value')
+ '/1' // replace with preceding line if OUs gain some meaning
@@ -241,12 +264,12 @@
}
function clearMergeRecords() {
- records = dojo.query('.toMerge').orphan();
+ var records = dojo.query('.toMerge').orphan();
dojo.addClass('mergebox-div', 'hidden');
}
function mergeRecords() {
- records = dojo.query('.toMerge').attr('id');
+ var records = dojo.query('.toMerge').attr('id');
dojo.forEach(records, function(item, idx) {
records[idx] = parseInt(item.slice(item.lastIndexOf('_') + 1));
});
More information about the open-ils-commits
mailing list