[open-ils-commits] [GIT] Evergreen ILS branch master updated. fd09be78adc3ea285dc4f2ad67ea4702faa8039d
Evergreen Git
git at git.evergreen-ils.org
Mon Mar 11 16:01:06 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via fd09be78adc3ea285dc4f2ad67ea4702faa8039d (commit)
from 7a83889b103b989b3633d57e61069b764509747f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fd09be78adc3ea285dc4f2ad67ea4702faa8039d
Author: Bill Erickson <berick at esilibrary.com>
Date: Tue Dec 11 15:50:56 2012 -0500
Remote Account Conify UI
Admin interface for config.remote_account. To date, remote accounts
have been managed solely as EDI accounts, which have their own
interface. If one wishes to add/manage non-EDI remote accounts, then
this new UI is needed.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Conflicts:
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
[minor, related to adjacent addition]
diff --git a/Open-ILS/src/templates/conify/global/config/remote_account.tt2 b/Open-ILS/src/templates/conify/global/config/remote_account.tt2
new file mode 100644
index 0000000..a63bedb
--- /dev/null
+++ b/Open-ILS/src/templates/conify/global/config/remote_account.tt2
@@ -0,0 +1,44 @@
+[% WRAPPER base.tt2 %]
+[% ctx.page_title = l('Remote Accounts') | html %]
+<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>[% ctx.page_title %]</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='raGrid.showCreateDialog()'>[% l('New') %]</button>
+ <button dojoType='dijit.form.Button' onClick='raGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
+ </div>
+</div>
+
+<table
+ id="raGrid"
+ jsid="raGrid"
+ dojoType="openils.widget.FlattenerGrid"
+ columnPersistKey='"conify.config.remote_account"'
+ autoHeight="true"
+ editOnEnter="true"
+ editStyle="pane"
+ showLoadFilter="true"
+ fmClass="'cracct'"
+ _autoCoreFields="true"
+ suppressEditFields="['id', 'last_activity']"
+ defaultSort="['owner_sn', 'label']"
+ query="{id : {'!=':0}}">
+ <thead>
+ <tr>
+ <th field="id" fpath="id"/>
+ <th field="owner_sn" fpath="owner.shortname" ffilter="true"/>
+ <th field="label" fpath="label" ffilter="true"/>
+ <th field="host" fpath="host" ffilter="true"/>
+ <th field="username" fpath="username" ffilter="true"/>
+ <th field="password" fpath="password" ffilter="true"/>
+ <th field="account" fpath="account" ffilter="true"/>
+ <th field="path" fpath="path" ffilter="true"/>
+ </tr>
+ </thead>
+</table>
+
+<script>
+ dojo.require('openils.widget.FlattenerGrid');
+</script>
+
+[% END %]
+
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index f327a52..4134573 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -785,6 +785,7 @@
<!ENTITY staff.main.menu.admin.server_admin.conify.config_asset_sip_fields "Asset Stat Cat Sip Fields">
<!ENTITY staff.main.menu.admin.server_admin.conify.config_usr_activity_type "User Activity Types">
<!ENTITY staff.main.menu.admin.server_admin.conify.actor.org_unit_custom_tree "Custom Org Unit Trees">
+<!ENTITY staff.main.menu.admin.server_admin.conify.config.remote_account "Remote Accounts">
<!ENTITY staff.main.menu.admin.server_admin.conify.global_flag.label "Global Flags">
<!ENTITY staff.main.menu.admin.server_admin.conify.circulation_limit_group.label "Circulation Limit Groups">
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 2fb9268..1dea0ef 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -1191,6 +1191,16 @@ main.menu.prototype = {
);
}
],
+ 'cmd_server_admin_conify_remote_account' : [
+ ['oncommand'],
+ function(event) {
+ open_eg_web_page(
+ "/eg/conify/global/config/remote_account",
+ "menu.cmd_server_admin_conify_remote_account.tab",
+ event
+ );
+ }
+ ],
'cmd_reprint' : [
['oncommand'],
function() {
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index dcd0003..0081bec 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -325,6 +325,9 @@
<command id="cmd_server_admin_config_best_hold_order"
perm="ADMIN_HOLD_CAPTURE_SORT"
/>
+ <command id="cmd_server_admin_conify_remote_account"
+ perm="ADMIN_CONFIG_REMOTE_ACCOUNT VIEW_CONFIG_REMOTE_ACCOUNT"
+ />
<command id="cmd_hotkeys_toggle" />
<command id="cmd_hotkeys_set" />
@@ -637,6 +640,7 @@
<menuitem label="&staff.main.menu.admin.server_admin.conify.config_usr_activity_type;" command="cmd_server_admin_config_usr_activity_type"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.config_best_hold_order;" command="cmd_server_admin_config_best_hold_order"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.actor.org_unit_custom_tree;" command="cmd_server_admin_actor_org_unit_custom_tree"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.config.remote_account;" command="cmd_server_admin_conify_remote_account"/>
<menu id="main.menu.admin.server.acq" label="&staff.main.menu.admin.server_admin.acq.label;" accesskey="&staff.main.menu.admin.server_admin.acq.accesskey;">
<menupopup id="main.menu.admin.server.acq.popup">
<menuitem label="&staff.main.menu.admin.server_admin.acq.fund.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund.accesskey;" command="cmd_server_admin_acq_fund" />
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
index c2f6212..adf86a6 100644
--- a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
+++ b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
@@ -255,6 +255,7 @@ menu.cmd_booking_resource.tab=Resources
menu.cmd_booking_reservation.tab=Reservations
menu.cmd_booking_reservation_pickup.tab=Reservation Pickup
menu.cmd_booking_reservation_return.tab=Reservation Return
+menu.cmd_server_admin_conify_remote_account.tab=Remote Accounts
menu.cmd_booking_pull_list.tab=Booking Pull List
menu.cmd_booking_capture.tab=Booking Capture
menu.cmd_authority_manage.tab=Manage Authorities
-----------------------------------------------------------------------
Summary of changes:
.../conify/global/config/remote_account.tt2 | 44 ++++++++++++++++++++
Open-ILS/web/opac/locale/en-US/lang.dtd | 1 +
.../xul/staff_client/chrome/content/main/menu.js | 10 ++++
.../chrome/content/main/menu_frame_menus.xul | 4 ++
.../chrome/locale/en-US/offline.properties | 1 +
5 files changed, 60 insertions(+), 0 deletions(-)
create mode 100644 Open-ILS/src/templates/conify/global/config/remote_account.tt2
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list