conify type interfaces in progress.
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 21 Jun 2011 14:27:11 +0000 (10:27 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 11 Jul 2011 17:48:29 +0000 (13:48 -0400)
not completely deleting old unfinished ones yet; there are probably
things to salvage

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
17 files changed:
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm
Open-ILS/web/js/dojo/openils/authority/nls/authority.js
Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/web/templates/default/authority/control_set.tt2 [new file with mode: 0644]
Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2 [deleted file]
Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old [new file with mode: 0644]
Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2 [deleted file]
Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old [new file with mode: 0644]
Open-ILS/web/templates/default/conify/global/authority/control_set.tt2 [deleted file]
Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old [new file with mode: 0644]
Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2 [deleted file]
Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old [new file with mode: 0644]
Open-ILS/xul/staff_client/chrome/content/main/menu.js
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties

index 621606e..052c802 100644 (file)
@@ -1759,7 +1759,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
        </class>
 
        <class id="acs" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="authority::control_set" oils_persist:tablename="authority.control_set" reporter:label="Authority Control Set">
-               <fields oils_persist:primary="id" oils_persist:sequence="authority.contol_set_id_seq">
+               <fields oils_persist:primary="id" oils_persist:sequence="authority.control_set_id_seq">
                        <field reporter:label="Control Set ID" name="id" reporter:datatype="id" reporter:selector="name"/>
                        <field reporter:label="Name" name="name" reporter:datatype="text" oils_persist:i18n="true" oils_obj:required="true" />
                        <field reporter:label="Description" name="description" reporter:datatype="text" oils_persist:i18n="true" />
@@ -1772,16 +1772,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
-                               <create permission="CREATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <create permission="CREATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                                <retrieve/>
-                               <update permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
-                               <delete permission="DELETE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <update permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
+                               <delete permission="DELETE_AUTHORITY_CONTROL_SET" global_required="true"/>
                        </actions>
                </permacrud>
        </class>
 
        <class id="acsaf" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="authority::control_set_authority_field" oils_persist:tablename="authority.control_set_authority_field" reporter:label="Authority Control Set Authority Field">
-               <fields oils_persist:primary="id" oils_persist:sequence="authority.contol_set_authority_field_id_seq">
+               <fields oils_persist:primary="id" oils_persist:sequence="authority.control_set_authority_field_id_seq">
                        <field reporter:label="Control Set Authority Field ID" name="id" reporter:datatype="id" reporter:selector="name"/>
                        <field reporter:label="Main Entry" name="main_entry" reporter:datatype="link"/>
                        <field reporter:label="Control Set" name="control_set" reporter:datatype="link"/>
@@ -1804,16 +1804,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
-                               <create permission="CREATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <create permission="CREATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                                <retrieve/>
-                               <update permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
-                               <delete permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <update permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
+                               <delete permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                        </actions>
                </permacrud>
        </class>
 
        <class id="acsbf" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="authority::control_set_bib_field" oils_persist:tablename="authority.control_set_bib_field" reporter:label="Authority Control Set Bib Field">
-               <fields oils_persist:primary="id" oils_persist:sequence="authority.contol_set_bib_field_id_seq">
+               <fields oils_persist:primary="id" oils_persist:sequence="authority.control_set_bib_field_id_seq">
                        <field reporter:label="Controlled Bib Field ID" name="id" reporter:datatype="id" reporter:selector="name"/>
                        <field reporter:label="Controlling Authority Field" name="authority_field" reporter:datatype="link"/>
                        <field reporter:label="Tag" name="tag" reporter:datatype="text" oils_obj:required="true" oils_obj:validate="^.{3}$"/>
@@ -1823,10 +1823,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
-                               <create permission="CREATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <create permission="CREATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                                <retrieve/>
-                               <update permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
-                               <delete permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <update permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
+                               <delete permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                        </actions>
                </permacrud>
        </class>
@@ -1843,10 +1843,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
-                               <create permission="CREATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <create permission="CREATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                                <retrieve/>
-                               <update permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
-                               <delete permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <update permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
+                               <delete permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                        </actions>
                </permacrud>
        </class>
@@ -1865,10 +1865,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
-                               <create permission="CREATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <create permission="CREATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                                <retrieve/>
-                               <update permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
-                               <delete permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                               <update permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
+                               <delete permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                        </actions>
                </permacrud>
        </class>
@@ -1885,10 +1885,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
         </links>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <actions>
-                <create permission="CREATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                <create permission="CREATE_AUTHORITY_CONTROL_SET" global_required="true"/>
                 <retrieve/>
-                <update permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
-                <delete permission="UPDATE_AUTHORITY_CONTROLSET" global_required="true"/>
+                <update permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
+                <delete permission="UPDATE_AUTHORITY_CONTROL_SET" global_required="true"/>
             </actions>
         </permacrud>
     </class>
index 9e60557..937aee7 100644 (file)
@@ -226,4 +226,48 @@ sub count_linked_bibs {
     return $link_count;
 }
 
+__PACKAGE__->register_method(
+    "method" => "retrieve_acs",
+    "api_name" => "open-ils.cat.authority.control_set.retrieve",
+    "api_level" => 1,
+    "stream" => 1,
+    "argc" => 2,
+    "signature" => {
+        "desc" => q/Retrieve authority.control_set objects with fleshed
+        thesauri and authority fields/,
+        "params" => [
+            {"name" => "limit",  "desc" => "limit (optional; default 15)", "type" => "number"},
+            {"name" => "offset",  "desc" => "offset doptional; default 0)", "type" => "number"},
+            {"name" => "id",  "desc" => "acs id (optional; default all)", "type" => "number"}
+        ]
+    }
+);
+
+# XXX I don't think this really needs to be protected by perms, or does it?
+sub retrieve_acs {
+    my $self = shift;
+    my $client = shift;
+
+    my ($limit, $offset, $id) = map int, @_;
+
+    $limit ||= 15;
+    $offset ||= 0;
+    $id ||= undef;
+
+    my $e = new_editor;
+    my $where = {"id" => ($id ? $id : {"!=" => undef})};
+    my $sets = $e->search_authority_control_set([
+        $where, {
+            "flesh" => 1,
+            "flesh_fields" => {"acs" => [qw/thesauri authority_fields/]},
+            "order_by" => {"acs" => "name"}
+        }
+    ]) or return $e->die_event;
+
+    $e->disconnect;
+
+    $client->respond($_) foreach @$sets;
+    return undef;
+}
+
 1;
index 732b433..f7ea8a0 100644 (file)
@@ -15,5 +15,7 @@
     "CONFIRM_DELETE_RESULT": "Deleted authority record # ${0}.",
     "SAVE": "Save",
     "SAVE_RESULT_SUCCESS": "Record was saved.",
-    "MERGE_RESULT_SUCCESS": "Record merge is complete."
+    "MERGE_RESULT_SUCCESS": "Record merge is complete.",
+    "THESAURI": "Thesauri (${0})",
+    "AUTHORITY_FIELDS": "Authority Fields (${0})"
 }
index 9e5be71..ab42a00 100644 (file)
@@ -208,7 +208,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
 
                     var entry = existing.filter(function(i){return (i.field == field.name)})[0];
                     if(entry) {
-                        entry.name = field.label;
+                        entry.name = entry.name || field.label;
                     } else {
                         // unless specifically requested, hide sequence fields
                         if(!this.showSequenceFields && field.name == this.fmIDL.pkey && this.fmIDL.pkey_sequence)
index 6352be9..f5e0502 100644 (file)
 <!ENTITY staff.main.menu.admin.server_admin.acq.exchange_rate.label "Exchange Rates">
 <!ENTITY staff.main.menu.admin.server_admin.acq.exchange_rate.accesskey "X">
 
+<!ENTITY staff.main.menu.admin.server_admin.authority.label "Authorities">
+<!ENTITY staff.main.menu.admin.server_admin.authority.accesskey "U">
+<!ENTITY staff.main.menu.admin.server_admin.authority.control_set.label "Control Sets">
+<!ENTITY staff.main.menu.admin.server_admin.authority.control_set.accesskey "C">
+
 <!ENTITY staff.main.menu.admin.server_admin.booking.label "Booking">
 <!ENTITY staff.main.menu.admin.server_admin.booking.accesskey "B">
 <!ENTITY staff.main.menu.admin.server_admin.booking.resource.label "Resources">
diff --git a/Open-ILS/web/templates/default/authority/control_set.tt2 b/Open-ILS/web/templates/default/authority/control_set.tt2
new file mode 100644 (file)
index 0000000..3c408da
--- /dev/null
@@ -0,0 +1,85 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = "Configure Authority Control Sets" %]
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+        <div>Control Sets</div>
+        <div>
+            <button dojoType="dijit.form.Button" onClick="acs_grid.showCreateDialog()">New Control Set</button>
+            <button dojoType="dijit.form.Button" onClick="acs_grid.deleteSelected()">Delete Selected</button>
+        </div>
+    </div>
+    <div>
+    <table  jsId="acs_grid"
+            dojoType="openils.widget.AutoGrid"
+            autoHeight="true"
+            defaultCellWidth="'auto'"
+            fieldOrder="['name','description','id']"
+            suppressEditFields="['id']"
+            query="{id: '*'}"
+            fmClass="acs"
+            editOnEnter="true">
+            <thead>
+                <tr>
+                    <th name="Other properties"
+                        field="id" formatter="format_acs_id"></th>
+                </tr>
+            </thead>
+    </table>
+</div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.AutoGrid");
+    dojo.requireLocalization('openils.authority', 'authority');
+    var localeStrings =
+        dojo.i18n.getLocalization('openils.authority', 'authority');
+    var acs_cache = {};
+
+    function format_acs_id(id) {
+        if (id) {
+            var tlen = acs_cache[id].thesauri() ?
+                acs_cache[id].thesauri().length : 0;
+            var alen = acs_cache[id].authority_fields() ?
+                acs_cache[id].authority_fields().length : 0;
+
+            return "<a href='" + oilsBasePath +
+                "/conify/global/authority/thesaurus?id=" + id + "'>" +
+                dojo.string.substitute(localeStrings.THESAURI, [tlen]) +
+                "</a> &nbsp;" + " <a href='" + oilsBasePath +
+                "/conify/global/authority/control_set_authority_field?id=" +
+                id + "'>" +
+                dojo.string.substitute(localeStrings.AUTHORITY_FIELDS, [alen]) +
+                "</a>";
+        }
+    }
+
+    function acs_grid_loader() {
+        acs_cache = {};
+        acs_grid.resetStore();
+        acs_grid.showLoadProgressIndicator();
+        fieldmapper.standardRequest(
+            ["open-ils.cat", "open-ils.cat.authority.control_set.retrieve"], {
+                "async": true,
+                "params": [acs_grid.displayLimit, acs_grid.displayOffset],
+                "onresponse": function(r) {
+                    if (r = openils.Util.readResponse(r)) {
+                        acs_cache[r.id()] = r;
+                        acs_grid.store.newItem(r.toStoreItem());
+                    }
+                },
+                "oncomplete": function() {
+                    acs_grid.hideLoadProgressIndicator();
+                }
+            }
+        );
+    }
+
+    openils.Util.addOnLoad(
+        function() {
+            acs_grid.onPostCreate = function(obj) {acs_cache[obj.id()] = obj;};
+            acs_grid.dataLoader = acs_grid_loader;
+            acs_grid_loader();
+            //acs_grid.loadAll({order_by:{acs : "name"}}, {"id": {"!=": null}});
+        }
+    );
+</script>
+[% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2 b/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2
deleted file mode 100644 (file)
index 2ae8cc8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Control Set Authority Fields' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Thesauri</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='acsafGrid.showCreateDialog()'>New Control Set Authority Field</button>
-            <button dojoType='dijit.form.Button' onClick='acsafGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="acsafGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['control_set','name','tag','sf_list','description','main_entry']"
-            suppressFields="['id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass='acsaf'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.PCrudAutocompleteBox");
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            acsafGrid.overrideEditWidgets.control_set =
-                new openils.widget.PCrudAutocompleteBox({
-                    "fmclass": "acs", "searchAttr": "name"
-                });
-            acsafGrid.overrideEditWidgets.control_set.shove = {"create": ""};
-            acsafGrid.loadAll({order_by:{acsaf : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old
new file mode 100644 (file)
index 0000000..2ae8cc8
--- /dev/null
@@ -0,0 +1,40 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Configure Control Set Authority Fields' %]
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div>Thesauri</div>
+        <div>
+            <button dojoType='dijit.form.Button' onClick='acsafGrid.showCreateDialog()'>New Control Set Authority Field</button>
+            <button dojoType='dijit.form.Button' onClick='acsafGrid.deleteSelected()'>Delete Selected</button>
+        </div>
+    </div>
+    <div>
+    <table  jsId="acsafGrid"
+            dojoType="openils.widget.AutoGrid"
+            autoHeight='true'
+            fieldOrder="['control_set','name','tag','sf_list','description','main_entry']"
+            suppressFields="['id']"
+            suppressEditFields="['id']"
+            query="{id: '*'}"
+            fmClass='acsaf'
+            editOnEnter='true'/>
+</div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.PCrudAutocompleteBox");
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            acsafGrid.overrideEditWidgets.control_set =
+                new openils.widget.PCrudAutocompleteBox({
+                    "fmclass": "acs", "searchAttr": "name"
+                });
+            acsafGrid.overrideEditWidgets.control_set.shove = {"create": ""};
+            acsafGrid.loadAll({order_by:{acsaf : 'name'}}, {"id": {"!=": null}});
+        }
+    );
+</script>
+[% END %]
+
+
diff --git a/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2 b/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2
deleted file mode 100644 (file)
index 4023d73..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Control Set Bibliographic Fields' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Thesauri</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='acsbfGrid.showCreateDialog()'>New Control Set Bibliographic Field</button>
-            <button dojoType='dijit.form.Button' onClick='acsbfGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="acsbfGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['tag','authority_field']"
-            suppressFields="['id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass='acsbf'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.PCrudAutocompleteBox");
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            acsbfGrid.overrideEditWidgets.authority_field =
-                new openils.widget.PCrudAutocompleteBox({
-                    "fmclass": "acsaf", "searchAttr": "name"
-                });
-            acsbfGrid.overrideEditWidgets.authority_field.shove = {"create": ""};
-            acsbfGrid.loadAll({order_by:{acsbf : 'tag'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old
new file mode 100644 (file)
index 0000000..4023d73
--- /dev/null
@@ -0,0 +1,40 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Configure Control Set Bibliographic Fields' %]
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div>Thesauri</div>
+        <div>
+            <button dojoType='dijit.form.Button' onClick='acsbfGrid.showCreateDialog()'>New Control Set Bibliographic Field</button>
+            <button dojoType='dijit.form.Button' onClick='acsbfGrid.deleteSelected()'>Delete Selected</button>
+        </div>
+    </div>
+    <div>
+    <table  jsId="acsbfGrid"
+            dojoType="openils.widget.AutoGrid"
+            autoHeight='true'
+            fieldOrder="['tag','authority_field']"
+            suppressFields="['id']"
+            suppressEditFields="['id']"
+            query="{id: '*'}"
+            fmClass='acsbf'
+            editOnEnter='true'/>
+</div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.PCrudAutocompleteBox");
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            acsbfGrid.overrideEditWidgets.authority_field =
+                new openils.widget.PCrudAutocompleteBox({
+                    "fmclass": "acsaf", "searchAttr": "name"
+                });
+            acsbfGrid.overrideEditWidgets.authority_field.shove = {"create": ""};
+            acsbfGrid.loadAll({order_by:{acsbf : 'tag'}}, {"id": {"!=": null}});
+        }
+    );
+</script>
+[% END %]
+
+
diff --git a/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2 b/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2
deleted file mode 100644 (file)
index c072d1c..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Authority Control Sets' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Control Sets</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='ctlSetGrid.showCreateDialog()'>New Control Set</button>
-            <button dojoType='dijit.form.Button' onClick='ctlSetGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="ctlSetGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['name','description']"
-            suppressFields="['id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass='acs'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad(
-        function() {
-            ctlSetGrid.loadAll({order_by:{acs : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old
new file mode 100644 (file)
index 0000000..c072d1c
--- /dev/null
@@ -0,0 +1,34 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Configure Authority Control Sets' %]
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div>Control Sets</div>
+        <div>
+            <button dojoType='dijit.form.Button' onClick='ctlSetGrid.showCreateDialog()'>New Control Set</button>
+            <button dojoType='dijit.form.Button' onClick='ctlSetGrid.deleteSelected()'>Delete Selected</button>
+        </div>
+    </div>
+    <div>
+    <table  jsId="ctlSetGrid"
+            dojoType="openils.widget.AutoGrid"
+            autoHeight='true'
+            fieldOrder="['name','description']"
+            suppressFields="['id']"
+            suppressEditFields="['id']"
+            query="{id: '*'}"
+            fmClass='acs'
+            editOnEnter='true'/>
+</div>
+
+<script type="text/javascript">
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad(
+        function() {
+            ctlSetGrid.loadAll({order_by:{acs : 'name'}}, {"id": {"!=": null}});
+        }
+    );
+
+</script>
+[% END %]
+
+
diff --git a/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2 b/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2
deleted file mode 100644 (file)
index 8061f92..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Authority Thesaurus' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Thesauri</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='thesGrid.showCreateDialog()'>New Thesaurus</button>
-            <button dojoType='dijit.form.Button' onClick='thesGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="thesGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['code','name','description','control_set]"
-            query="{code:'*'}"
-            fmClass='at'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.PCrudAutocompleteBox");
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            thesGrid.overrideEditWidgets.control_set =
-                new openils.widget.PCrudAutocompleteBox({
-                    "fmclass": "acs", "searchAttr": "name"
-                });
-            thesGrid.overrideEditWidgets.control_set.shove = {"create": ""};
-            thesGrid.loadAll({order_by:{at : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old
new file mode 100644 (file)
index 0000000..8061f92
--- /dev/null
@@ -0,0 +1,38 @@
+[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'Configure Authority Thesaurus' %]
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div>Thesauri</div>
+        <div>
+            <button dojoType='dijit.form.Button' onClick='thesGrid.showCreateDialog()'>New Thesaurus</button>
+            <button dojoType='dijit.form.Button' onClick='thesGrid.deleteSelected()'>Delete Selected</button>
+        </div>
+    </div>
+    <div>
+    <table  jsId="thesGrid"
+            dojoType="openils.widget.AutoGrid"
+            autoHeight='true'
+            fieldOrder="['code','name','description','control_set]"
+            query="{code:'*'}"
+            fmClass='at'
+            editOnEnter='true'/>
+</div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.PCrudAutocompleteBox");
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            thesGrid.overrideEditWidgets.control_set =
+                new openils.widget.PCrudAutocompleteBox({
+                    "fmclass": "acs", "searchAttr": "name"
+                });
+            thesGrid.overrideEditWidgets.control_set.shove = {"create": ""};
+            thesGrid.loadAll({order_by:{at : 'name'}}, {"id": {"!=": null}});
+        }
+    );
+</script>
+[% END %]
+
+
index 79949f4..3caf9d6 100644 (file)
@@ -959,6 +959,10 @@ main.menu.prototype = {
                 ['oncommand'],
                 function(event) { open_eg_web_page('conify/global/config/usr_setting_type', null, event); }
             ],
+            'cmd_server_admin_authority_control_set': [
+                ['oncommand'],
+                function(event) { open_eg_web_page('authority/control_set', null, event); }
+            ],
             'cmd_server_admin_booking_resource': [
                 ['oncommand'],
                 function(event) { open_eg_web_page('conify/global/booking/resource', null, event); }
@@ -1157,8 +1161,11 @@ main.menu.prototype = {
             'cmd_authority_manage' : [
                 ['oncommand'],
                 function(event) {
-                    obj.data.stash_retrieve();
-                    obj.command_tab(event,obj.url_prefix(urls.AUTHORITY_MANAGE),{},{});
+                    open_eg_web_page(
+                        urls.AUTHORITY_MANAGE,
+                        "menu.cmd_authority_manage.tab",
+                        event
+                    );
                 }
             ],
 
index 741c0ce..d1279c1 100644 (file)
     <command id="cmd_server_admin_config_rule_age_hold_protect"
              perm="ADMIN_AGE_PROTECT_RULE"
              />
+
+    <command id="cmd_server_admin_authority_control_set" />
+
     <command id="cmd_server_admin_booking_resource" />
     <command id="cmd_server_admin_booking_resource_type" />
     <command id="cmd_server_admin_booking_resource_attr" />
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.cancel_reason.label;" accesskey="&staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey;" command="cmd_server_admin_acq_cancel_reason"/>
                     </menupopup>
                 </menu>
+
+                <menu id="main.menu.admin.server.authority" label="&staff.main.menu.admin.server_admin.authority.label;" accesskey="&staff.main.menu.admin.server_admin.authority.accesskey;">
+                    <menupopup id="main.menu.admin.server.authority.popup">
+                        <menuitem label="&staff.main.menu.admin.server_admin.authority.control_set.label;" command="cmd_server_admin_authority_control_set" accesskey="&staff.main.menu.admin.server_admin.authority.control_set.accesskey;"/>
+                    </menupopup>
+                </menu>
+
                 <menu id="main.menu.admin.server.booking" label="&staff.main.menu.admin.server_admin.booking.label;" accesskey="&staff.main.menu.admin.server_admin.booking.accesskey;">
                     <menupopup id="main.menu.admin.server.booking.popup">
                         <menuitem label="&staff.main.menu.admin.server_admin.booking.resource.label;" command="cmd_server_admin_booking_resource" accesskey="&staff.main.menu.admin.server_admin.booking.resource.accesskey;"/>
index eceebc7..753da58 100644 (file)
@@ -251,6 +251,7 @@ menu.cmd_booking_reservation_pickup.tab=Reservation Pickup
 menu.cmd_booking_reservation_return.tab=Reservation Return
 menu.cmd_booking_pull_list.tab=Booking Pull List
 menu.cmd_booking_capture.tab=Booking Capture
+menu.cmd_authority_manage.tab=Manage Authorities
 menu.local_admin.barcode_completion.tab=Barcode Completion
 menu.local_admin.circ_matrix_matchpoint.tab=Circulation Policies
 menu.local_admin.hold_matrix_matchpoint.tab=Hold Policies