[open-ils-commits] r10976 - in trunk/Open-ILS/web: conify/global/permission js/dojo/openils/conify/nls

svn at svn.open-ils.org svn at svn.open-ils.org
Wed Oct 29 13:21:58 EDT 2008


Author: dbs
Date: 2008-10-29 13:21:54 -0400 (Wed, 29 Oct 2008)
New Revision: 10976

Added:
   trunk/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js
Removed:
   trunk/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js
Modified:
   trunk/Open-ILS/web/conify/global/permission/perm_list.html
   trunk/Open-ILS/web/conify/global/permission/perm_list.js
Log:
As Craig Ricciuto noted, perm_list maps to the ppl class hint


Modified: trunk/Open-ILS/web/conify/global/permission/perm_list.html
===================================================================
--- trunk/Open-ILS/web/conify/global/permission/perm_list.html	2008-10-29 17:12:53 UTC (rev 10975)
+++ trunk/Open-ILS/web/conify/global/permission/perm_list.html	2008-10-29 17:21:54 UTC (rev 10976)
@@ -78,7 +78,7 @@
                     method : 'open-ils.permacrud.search.ppl.atomic',
                     timeout : 10,
                     params : [ ses, { id : { "!=" : null } }, { order_by : { ppl : 'code' } } ],
-                    onerror : function (r) { status_update(pgt_strings.ERROR_FETCHING_PERMS) },
+                    onerror : function (r) { status_update(ppl_strings.ERROR_FETCHING_PERMS) },
                     oncomplete : function (r) {
 
                         window._perm_list = r.recv().content();
@@ -94,11 +94,11 @@
 						window.perm_grid_layout = [
 							{	cells : [
 									[
-										{ name : pgt_strings.LABEL_CODE,        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" },
-										{ name : pgt_strings.LABEL_DESCRIPTION, field : "description", width : "auto",  editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }
+										{ name : ppl_strings.LABEL_CODE,        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" },
+										{ name : ppl_strings.LABEL_DESCRIPTION, field : "description", width : "auto",  editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }
 									],
 									[
-										{ name : pgt_strings.LABEL_TRANSLATION,
+										{ name : ppl_strings.LABEL_TRANSLATION,
 										  width : "10em",
 										  height : "2em",
 										  get : function (row) {
@@ -134,7 +134,7 @@
                             });
 
                             if (dirtyStore.length > 0) {
-                                var confirmation = confirm(pgt_strings.CONFIRM_EXIT);
+                                var confirmation = confirm(ppl_strings.CONFIRM_EXIT);
 
                                 if (confirmation) {
                                     for (var i in window.dirtyStore) {
@@ -171,7 +171,7 @@
                     	    params : [ ses, new_fm_obj ],
 	                        onerror : function (r) {
     	                        highlighter.red.play();
-        	                    status_update( pgt_strings.ERROR_CALLING_METHOD );
+        	                    status_update( ppl_strings.ERROR_CALLING_METHOD );
             	                err = true;
                 	        },
 	                        oncomplete : function (r) {
@@ -179,12 +179,12 @@
         	                    if ( res && res.content() ) {
             	                    var new_item_hash = res.content().toHash();
             	                    perm_store.newItem( new_item_hash );
-									status_update( dojo.string.substitute(pgt_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) );
+									status_update( dojo.string.substitute(ppl_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) );
 									perm_grid.model.sort(-1);
 									highlighter.green.play();
                             	} else {
 	                                highlighter.red.play();
-    	                            status_update( pgt_strings.ERROR_CREATING_PERMISSION );
+    	                            status_update( ppl_strings.ERROR_CREATING_PERMISSION );
         	                        err = true;
             	                }
                 	        }
@@ -225,7 +225,7 @@
 						for (var i in selected_items) {
 							current_perm = selected_items[i];
 
-							if ( confirm( dojo.string.substitute(pgt_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) {
+							if ( confirm( dojo.string.substitute(ppl_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) {
 
 								perm_store.setValue( current_perm, 'isdeleted', 1 );
 			
@@ -238,7 +238,7 @@
 									params : [ ses, modified_ppl ],
 									onerror : function (r) {
 										highlighter.red.play();
-										status_update( dojo.string.substitute(pgt_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) );
+										status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) );
 									},
 									oncomplete : function (r) {
 										var res = r.recv();
@@ -255,10 +255,10 @@
 											current_perm = null;
 			
 											highlighter.green.play();
-											status_update( dojo.string.substitute(pgt_strings.STATUS_DELETED, [old_name]) );
+											status_update( dojo.string.substitute(ppl_strings.STATUS_DELETED, [old_name]) );
 										} else {
 											highlighter.red.play();
-											status_update( dojo.string.substitute(pgt_strings.ERROR_DELETING, [old_name]) );
+											status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [old_name]) );
 										}
 									}
 								}).send();

Modified: trunk/Open-ILS/web/conify/global/permission/perm_list.js
===================================================================
--- trunk/Open-ILS/web/conify/global/permission/perm_list.js	2008-10-29 17:12:53 UTC (rev 10975)
+++ trunk/Open-ILS/web/conify/global/permission/perm_list.js	2008-10-29 17:21:54 UTC (rev 10976)
@@ -29,7 +29,7 @@
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
 dojo.require('dojox.grid.Grid');
-dojo.requireLocalization("openils.config", "pgt");
+dojo.requireLocalization("openils.config", "ppl");
 
 // some handy globals
 var cgi = new CGI();
@@ -37,7 +37,7 @@
 var ses = cookieManager.read('ses') || cgi.param('ses');
 var pCRUD = new OpenSRF.ClientSession('open-ils.permacrud');
 
-var pgt_strings = dojo.i18n.getLocalization('openils.conify', 'pgt');
+var ppl_strings = dojo.i18n.getLocalization('openils.conify', 'ppl');
 
 var current_perm;
 var virgin_out_id = -1;
@@ -61,17 +61,17 @@
 		params : [ ses, modified_ppl ],
 		onerror : function (r) {
 			highlighter.red.play();
-			status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
+			status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
 		},
 		oncomplete : function (r) {
 			var res = r.recv();
 			if ( res && res.content() ) {
 				perm_store.setValue( current_perm, 'ischanged', 0 );
 				highlighter.green.play();
-				status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) );
+				status_update( dojo.string.substitute(ppl_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) );
 			} else {
 				highlighter.red.play();
-				status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
+				status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
 			}
 		},
 	}).send();
@@ -89,7 +89,7 @@
 
 
 	if (event && dirtyStore.length > 0) {
-		confirmation = confirm( pgt_strings.CONFIRM_EXIT );
+		confirmation = confirm( ppl_strings.CONFIRM_EXIT );
 	}
 
 	if (confirmation) {

Deleted: trunk/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js	2008-10-29 17:12:53 UTC (rev 10975)
+++ trunk/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js	2008-10-29 17:21:54 UTC (rev 10976)
@@ -1,15 +0,0 @@
-({
-	"CONFIRM_DELETE": "Are you sure you want to delete ${0}?",
-	"CONFIRM_EXIT": "There are unsaved modified Permissions! OK to save these changes, Cancel to abandon them.",
-	"ERROR_CALLING_METHOD": "Problem calling method to create new Permission",
-	"ERROR_CREATING_PERMISSION": "Problem creating new Permission",
-	"ERROR_DELETING": "Problem deleting ${0}",
-	"ERROR_FETCHING_PERMS": "Problem fetching perms",
-	"ERROR_SAVING_DATA": "Problem saving data for ${0}",
-	"LABEL_CODE": "Code",
-	"LABEL_DESCRIPTION": "Description",
-	"LABEL_TRANSLATION": "Translation",
-	"STATUS_DELETED": "${0} deleted", 
-	"SUCCESS_CREATING_PERMISSION": "New ${0} permission created",
-	"SUCCESS_SAVE": "Saved changes to ${0}"
-})

Copied: trunk/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js (from rev 10975, trunk/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js)
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js	                        (rev 0)
+++ trunk/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js	2008-10-29 17:21:54 UTC (rev 10976)
@@ -0,0 +1,15 @@
+({
+	"CONFIRM_DELETE": "Are you sure you want to delete ${0}?",
+	"CONFIRM_EXIT": "There are unsaved modified Permissions! OK to save these changes, Cancel to abandon them.",
+	"ERROR_CALLING_METHOD": "Problem calling method to create new Permission",
+	"ERROR_CREATING_PERMISSION": "Problem creating new Permission",
+	"ERROR_DELETING": "Problem deleting ${0}",
+	"ERROR_FETCHING_PERMS": "Problem fetching perms",
+	"ERROR_SAVING_DATA": "Problem saving data for ${0}",
+	"LABEL_CODE": "Code",
+	"LABEL_DESCRIPTION": "Description",
+	"LABEL_TRANSLATION": "Translation",
+	"STATUS_DELETED": "${0} deleted", 
+	"SUCCESS_CREATING_PERMISSION": "New ${0} permission created",
+	"SUCCESS_SAVE": "Saved changes to ${0}"
+})



More information about the open-ils-commits mailing list