From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 14 Jul 2008 21:07:27 +0000 (+0000)
Subject: fixing translation framework for perms and statuses; adding marc codes to admin page
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fd17e8d3ae0aebde09522ca075e7f9badbfa4a8b;p=Evergreen.git

fixing translation framework for perms and statuses; adding marc codes to admin page

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10032 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/conify/global/admin.html b/Open-ILS/web/conify/global/admin.html
index 8a4ff3f868..a5aa53eb3f 100644
--- a/Open-ILS/web/conify/global/admin.html
+++ b/Open-ILS/web/conify/global/admin.html
@@ -63,6 +63,7 @@
 					<li><a href="" onclick="dojo.byId('action_iframe').src = 'permission/grp_tree.html'; return false;">Permission Groups</a></li>
 					<li><a href="" onclick="dojo.byId('action_iframe').src = 'permission/perm_list.html'; return false;">Permissions</a></li>
 					<li><a href="" onclick="dojo.byId('action_iframe').src = 'config/copy_status.html'; return false;">Copy Statuses</a></li>
+					<li><a href="" onclick="dojo.byId('action_iframe').src = 'config/marc_code_maps.html'; return false;">MARC Codes</a></li>
 				</ul>
 			</div>
 			<div id="content_pane" jsId="content_pane" dojoType="dijit.layout.ContentPane" layoutAlign="client" style="margin: 2px; border-top: 2px solid grey; border-bottom: 2px solid grey; border-left: 2px solid grey;">
diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html
index 8b6f062888..e635748077 100644
--- a/Open-ILS/web/conify/global/config/copy_status.html
+++ b/Open-ILS/web/conify/global/config/copy_status.html
@@ -192,6 +192,7 @@
 												setTimeout(
 													'dojo.query(".status_grid_trans_cell_' + row + '").'+
 														'instantiate(openils.widget.TranslatorPopup,{field:"name",'+
+														'unique:window.status_rows['+row+'].id(),'+
 														'targetObject:"window.status_rows['+row+']"});'+
 														'status_grid.rowHeightChanged('+row+')',
 													0
diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html
index 518ffeb8d2..7e698cff6c 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.html
+++ b/Open-ILS/web/conify/global/permission/perm_list.html
@@ -62,12 +62,9 @@
 
 		<div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
 			<script type="dojo/method">
-				window.highlighter= {};
 				window.highlighter.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } );
 				window.highlighter.red = dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } );
 
-				window.dirtyStore = [];
-
                 pCRUD.request({
                     method : 'open-ils.permacrud.search.ppl.atomic',
                     timeout : 10,
@@ -99,10 +96,11 @@
 											if (!window.perm_rows) window.perm_rows = [];
 											var r = window.perm_data_model.getRow(row);
 											if (r) {
-												window.perm_rows[row] = new ccs().fromHash(window.perm_data_model.getRow(row));
+												window.perm_rows[row] = new ppl().fromHash(window.perm_data_model.getRow(row));
 												setTimeout(
 													'dojo.query(".perm_grid_trans_desc_' + row + '").'+
 														'instantiate(openils.widget.TranslatorPopup,{field:"description",'+
+														'unique:window.perm_rows['+row+'].code(),'+
 														'targetObject:"window.perm_rows['+row+']"});'+
 														'perm_grid.rowHeightChanged('+row+')',
 													0
diff --git a/Open-ILS/web/conify/global/permission/perm_list.js b/Open-ILS/web/conify/global/permission/perm_list.js
index 8d54750ab4..e91d88a901 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.js
+++ b/Open-ILS/web/conify/global/permission/perm_list.js
@@ -42,6 +42,8 @@ var current_perm;
 var virgin_out_id = -1;
 
 var highlighter = {};
+var dirtyStore = [];
+
 
 function status_update (markup) {
 	if (parent !== window && parent.status_update) parent.status_update( markup );