Changeset 9443 for branches/acq-experiment/Open-ILS/web/conify/global/permission/perm_list.html

Timestamp:

04/23/08 20:38:57 (2 months ago)

Author:

erickson

Message:

Merged revisions 9437,9440-9442 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9437 | erickson | 2008-04-22 22:50:31 -0400 (Tue, 22 Apr 2008) | 1 line

fixed what appears to be some copy paste errors. no longer requiring kwargs to be non-null on User create

........

r9440 | miker | 2008-04-23 08:23:10 -0400 (Wed, 23 Apr 2008) | 1 line

adding helper views for overdue, running and pending reports

........

r9441 | erickson | 2008-04-23 11:13:45 -0400 (Wed, 23 Apr 2008) | 4 lines

Removing dead code and their makefile counterparts

........

r9442 | miker | 2008-04-23 13:17:15 -0400 (Wed, 23 Apr 2008) | 1 line

adding translation for description

........

Location:

branches/acq-experiment

Files:

• . (modified) (1 prop)
• Open-ILS/web/conify/global/permission/perm_list.html (modified) (1 diff)

branches/acq-experiment/Open-ILS/web/conify/global/permission/perm_list.html

@@ -89 +89 @@
                                                         {       cells : [
                                                                         [
-                                                                                { name : "Code",        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit },
-                                                                                { name : "Description", field : "description", width : "auto",  editor : dojox.grid.editors.Editor }
+                                                                                { name : "Code",        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" },
+                                                                                { name : "Description", field : "description", width : "auto",  editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }
+                                                                        ],
+                                                                        [
+                                                                                { name : "Translation",
+                                                                                  width : "10em",
+                                                                                  height : "2em",
+                                                                                  get : function (row) {
+                                                                                        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));
+                                                                                                setTimeout(
+                                                                                                        'dojo.query(".perm_grid_trans_desc_' + row + '").'+
+                                                                                                                'instantiate(openils.I18N.translationWidget,{field:"description",'+
+                                                                                                                'targetObject:"window.perm_rows['+row+']",unique:"' + row + '"});'+
+                                                                                                                'perm_grid.rowHeightChanged('+row+')',
+                                                                                                        0
+                                                                                                );
+                                                                                                var oldnode = dojo.byId('description_translation_' + row);
+                                                                                                if (oldnode) dijit.byNode(oldnode).destroyRecursive();
+                                                                                                return '<span class="perm_grid_trans_desc_'+row+'"></span>';
+                                                                                        }
+                                                                                        return '';
+                                                                                  }
+                                                                                }
                                                                         ]
                                                                 ]