[open-ils-commits] r16595 - branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking (senator)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Jun 4 16:49:29 EDT 2010
Author: senator
Date: 2010-06-04 16:49:24 -0400 (Fri, 04 Jun 2010)
New Revision: 16595
Modified:
branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource.tt2
branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2
branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2
branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2
Log:
Booking: these misc AutoGrid-based booking admin interfaces were broken
Modified: branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource.tt2
===================================================================
--- branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource.tt2 2010-06-04 19:00:55 UTC (rev 16594)
+++ branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource.tt2 2010-06-04 20:49:24 UTC (rev 16595)
@@ -1,43 +1,34 @@
[% WRAPPER default/base.tt2 %]
[% ctx.page_title = 'Resources' %]
-
-<script src="/opac/common/js/CGI.js" type="text/javascript"></script>
<script type ="text/javascript">
dojo.require('dijit.form.FilteringSelect');
dojo.require('openils.widget.AutoGrid');
- dojo.require('openils.XUL');
openils.Util.addOnLoad(
function() {
- var search = undefined; // default to all objs
- if (xulG && xulG.resultant_brsrc) {
+ var search = {"id": {"!=": null}};
+ if (xulG && xulG.resultant_brsrc)
search = {id: xulG.resultant_brsrc};
- }
- ustGrid.loadAll({order_by:{brsrc : 'barcode'}}, search);
+ brsrcGrid.loadAll({order_by:{brsrc : 'barcode'}}, search);
}
);
</script>
-
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
- <div>Resources</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New Resource</button>
- <button dojoType='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
- </div>
-</div>
-
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <table jsId="ustGrid"
- autoHeight='true'
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+ <div>Resources</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='brsrcGrid.showCreateDialog()'>New Resource</button>
+ <button dojoType='dijit.form.Button' onClick='brsrcGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <table jsId="brsrcGrid"
dojoType="openils.widget.AutoGrid"
fieldOrder="['owner', 'type', 'barcode',
'overbook', 'deposit', 'deposit_amount', 'user_fee']"
- query="{name: '*'}"
- defaultCellWidth='"auto"'
+ query="{id: '*'}"
fmClass='brsrc'
showPaginator='true'
editOnEnter='true'>
</table>
- </div>
-
+</div>
[% END %]
Modified: branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
===================================================================
--- branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2 2010-06-04 19:00:55 UTC (rev 16594)
+++ branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2 2010-06-04 20:49:24 UTC (rev 16595)
@@ -1,39 +1,31 @@
[% WRAPPER default/base.tt2 %]
[% ctx.page_title = 'Resource Attributes' %]
-
<script type ="text/javascript">
dojo.require('dijit.form.FilteringSelect');
dojo.require('openils.widget.AutoGrid');
openils.Util.addOnLoad(
function() {
- ustGrid.loadAll({order_by:{bra : 'name'}});
+ braGrid.loadAll({order_by:{bra : 'name'}}, {"id": {"!=": null}});
}
);
</script>
-
-
-
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
- <div>Resource Attributes</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New Resource Attribute</button>
- <button dojoType='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
- </div>
-</div>
-
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <table jsId="ustGrid"
- autoHeight='true'
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+ <div>Resource Attributes</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='braGrid.showCreateDialog()'>New Resource Attribute</button>
+ <button dojoType='dijit.form.Button' onClick='braGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <table jsId="braGrid"
dojoType="openils.widget.AutoGrid"
- fieldOrder="['name', 'fine_interval', 'fine_amount',
- 'owner', 'catalog_item', 'transferable', 'record']"
- query="{name: '*'}"
- defaultCellWidth='"auto"'
+ fieldOrder="['name', 'owner', 'resource_type', 'required']"
+ query="{id: '*'}"
fmClass='bra'
showPaginator='true'
editOnEnter='true'>
</table>
- </div>
+</div>
[% END %]
Modified: branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2
===================================================================
--- branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2 2010-06-04 19:00:55 UTC (rev 16594)
+++ branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2 2010-06-04 20:49:24 UTC (rev 16595)
@@ -1,39 +1,28 @@
[% WRAPPER default/base.tt2 %]
[% ctx.page_title = 'Resource Attribute Maps' %]
-
<script type ="text/javascript">
dojo.require('dijit.form.FilteringSelect');
dojo.require('openils.widget.AutoGrid');
openils.Util.addOnLoad(
- function() {
- ustGrid.loadAll({order_by:{bram : 'name'}});
- }
+ function() { bramGrid.loadAll({order_by:{bram : 'resource_attr'}}); }
);
</script>
-
-
-
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
- <div>Resource Attribute Maps</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New Resource Attribute Map</button>
- <button dojoType='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
- </div>
-</div>
-
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <table jsId="ustGrid"
- autoHeight='true'
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Resource Attribute Maps</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='bramGrid.showCreateDialog()'>New Resource Attribute Map</button>
+ <button dojoType='dijit.form.Button' onClick='bramGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <table jsId="bramGrid"
dojoType="openils.widget.AutoGrid"
- fieldOrder="['name', 'fine_interval', 'fine_amount',
- 'owner', 'catalog_item', 'transferable', 'record']"
- query="{name: '*'}"
- defaultCellWidth='"auto"'
+ fieldOrder="['resource', 'resource_attr', 'value']"
+ query="{id: '*'}"
fmClass='bram'
showPaginator='true'
editOnEnter='true'>
</table>
- </div>
-
+</div>
[% END %]
Modified: branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2
===================================================================
--- branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2 2010-06-04 19:00:55 UTC (rev 16594)
+++ branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2 2010-06-04 20:49:24 UTC (rev 16595)
@@ -1,39 +1,30 @@
[% WRAPPER default/base.tt2 %]
[% ctx.page_title = 'Resource Attribute Values' %]
-
<script type ="text/javascript">
dojo.require('dijit.form.FilteringSelect');
dojo.require('openils.widget.AutoGrid');
openils.Util.addOnLoad(
function() {
- ustGrid.loadAll({order_by:{brav : 'name'}});
+ bravGrid.loadAll({order_by:{brav : 'attr'}}, {"id": {"!=": null}});
}
);
</script>
-
-
-
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
- <div>Resource Attribute Values</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New Resource Attribute Value</button>
- <button dojoType='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
- </div>
-</div>
-
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <table jsId="ustGrid"
- autoHeight='true'
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Resource Attribute Values</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='bravGrid.showCreateDialog()'>New Resource Attribute Value</button>
+ <button dojoType='dijit.form.Button' onClick='bravGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <table jsId="bravGrid"
dojoType="openils.widget.AutoGrid"
- fieldOrder="['name', 'fine_interval', 'fine_amount',
- 'owner', 'catalog_item', 'transferable', 'record']"
- query="{name: '*'}"
- defaultCellWidth='"auto"'
+ fieldOrder="['owner', 'attr', 'valid_value']"
+ query="{id: '*'}"
fmClass='brav'
showPaginator='true'
editOnEnter='true'>
</table>
- </div>
-
+</div>
[% END %]
Modified: branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2
===================================================================
--- branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2 2010-06-04 19:00:55 UTC (rev 16594)
+++ branches/rel_1_6/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2 2010-06-04 20:49:24 UTC (rev 16595)
@@ -1,40 +1,32 @@
[% WRAPPER default/base.tt2 %]
[% ctx.page_title = 'Resource Types' %]
-
<script type ="text/javascript">
dojo.require('dijit.form.FilteringSelect');
dojo.require('openils.widget.AutoGrid');
openils.Util.addOnLoad(
function() {
- ustGrid.loadAll({order_by:{brt : 'name'}});
+ brtGrid.loadAll({"order_by": {"brt": "name"}}, {"id": {"!=": null}});
}
);
</script>
-
-
-
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
- <div>Resource Types</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New Resource Type</button>
- <button dojoType='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
- </div>
-</div>
-
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <table jsId="ustGrid"
- autoHeight='true'
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+ <div>Resource Types</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='brtGrid.showCreateDialog()'>New Resource Type</button>
+ <button dojoType='dijit.form.Button' onClick='brtGrid.deleteSelected()'>Delete Selected</button>
+ </div>
+ </div>
+ <table jsId="brtGrid"
dojoType="openils.widget.AutoGrid"
fieldOrder="['name', 'fine_interval', 'fine_amount',
'owner', 'catalog_item', 'transferable']"
suppressFields="['record']"
- query="{name: '*'}"
- defaultCellWidth='"auto"'
+ query="{id: '*'}"
fmClass='brt'
showPaginator='true'
editOnEnter='true'>
</table>
- </div>
-
+</div>
[% END %]
More information about the open-ils-commits
mailing list