[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0f507bd002605883c347cb0e235d3837c491edb0
Evergreen Git
git at git.evergreen-ils.org
Fri Mar 8 10:56:30 EST 2019
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 0f507bd002605883c347cb0e235d3837c491edb0 (commit)
via 3946b81aefcdbab2973ab012eb28569172471a55 (commit)
via e29d207f5cdaad8e1f217ae1ac119a2d7ba4f8ca (commit)
from b60c99e6df85c69c42c752b3e49a20527e931605 (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 0f507bd002605883c347cb0e235d3837c491edb0
Author: Michele Morgan <mmorgan at noblenet.org>
Date: Fri Mar 8 09:49:42 2019 -0500
LP1716473 A few tweaks to correct field labels
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index bd7217c9f2..3628a9ed1f 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -227,7 +227,7 @@
</div>
</li>
<li ng-if="defaults.attributes.opac_visible">
- <div class="bg-info"><label>[% l('OPAC Visible') %]</label></div>
+ <div class="bg-info"><label>[% l('OPAC Visible?') %]</label></div>
<div ng-class="{'bg-success': working.opac_visible !== undefined}">
<div class="col-lg-6">
<label>
@@ -252,7 +252,7 @@
</div>
</li>
<li ng-if="defaults.attributes.circ_modifier">
- <div class="bg-info"><label>[% l('OPAC Visible') %]</label></div>
+ <div class="bg-info"><label>[% l('Circulation Modifier') %]</label></div>
<div ng-class="{'bg-success': working.circ_modifier !== undefined}">
<select class="form-control"
ng-model="working.circ_modifier"
@@ -379,7 +379,7 @@
</div>
</li>
<li ng-if="defaults.attributes.deposit_amount">
- <div class="bg-info"><label>[% l('Deposit Amount?') %]</label></div>
+ <div class="bg-info"><label>[% l('Deposit Amount') %]</label></div>
<div ng-class="{'bg-success': working.deposit_amount !== undefined}">
<input class="form-control" str-to-float
ng-model="working.deposit_amount" type="number" step="0.01"/>
@@ -461,7 +461,7 @@
<div ng-if="hasMulti()"> </div>
</li>
<li ng-if="defaults.attributes.alerts">
- <div class="bg-info"><label>[% l('Item Notes') %]</label></div>
+ <div class="bg-info"><label>[% l('Item Alerts') %]</label></div>
<div ng-class="{'bg-success': working.alerts !== undefined}">
<button class="btn btn-default" type="button"
ng-click="copy_alerts_dialog(workingGridControls.selectedItems())">
commit 3946b81aefcdbab2973ab012eb28569172471a55
Author: Bill Erickson <berickxx at gmail.com>
Date: Mon Mar 4 16:41:01 2019 -0500
LP1716473 Release Notes: copy edit hide disabled
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Geoff Sams <gsams at roanoketexas.com>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
diff --git a/docs/RELEASE_NOTES_NEXT/Cataloging/copy-edit-hide-defaults.adoc b/docs/RELEASE_NOTES_NEXT/Cataloging/copy-edit-hide-defaults.adoc
new file mode 100644
index 0000000000..89bd4e1d0e
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Cataloging/copy-edit-hide-defaults.adoc
@@ -0,0 +1,15 @@
+Copy Edit Interface Display Modifications
+^^^^^^^^^^^^^^^^^^^^^^^^^^6^^^^^^^^^^^^^^
+
+Hide Disabled Fields
+++++++++++++++++++++
+
+Disabling a field in the "Defaults" tab in the copy editor now hides the
+field instead of simply disabling it.
+
+Working Items Moves Down
+++++++++++++++++++++++++
+
+The "Working Items" grid now sits below the item attribute edit area, so the
+attribute are allowed to fill the horizontal space.
+
commit e29d207f5cdaad8e1f217ae1ac119a2d7ba4f8ca
Author: Bill Erickson <berickxx at gmail.com>
Date: Mon Mar 4 14:06:59 2019 -0500
LP1716473 Copy editor hide disabled defaults
Disabling a field in the copy editor "Defaults" tab now hides the field
instead of simply disabling it. Once a field is hidden, subsequent
field shift left to fill the space.
The "Working Items" grid is shifted to the bottom of the page, below the
attributes editor. This allows the attributes to fill the horizontal
space and puts the working items and save operations visually at the end
of the page, i.e. at end of the work flow.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Geoff Sams <gsams at roanoketexas.com>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 7e58ebb731..bd7217c9f2 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -5,514 +5,526 @@
.css-form select.ng-invalid {
background-color: #FA787E;
}
+
+ ul.copy-attributes-grid {
+ list-style: none;
+ display: flex;
+ flex-wrap: wrap;
+ padding-inline-start: 0px;
+ }
+
+ ul.copy-attributes-grid > li {
+ padding: 5px;
+ margin: 5px;
+ /* Force the grid to overflow to the next line every 4 entries
+ while leaving some wiggle space for padding/margins */
+ flex-basis: 24%;
+ display: flex;
+ flex-direction: column;
+ }
+
+ ul.copy-attributes-grid > li > div {
+ flex: 1;
+ /* padding here is required to allow the "item modified" bg
+ color to appear around some widgets (mainly selectors) */
+ padding: 6px;
+ }
+
+ ul.copy-attributes-grid > li > div:nth-child(1) {
+ border-radius: 6px 6px 0px 0px;
+ }
+
+ ul.copy-attributes-grid > li > div:nth-child(2) {
+ border: 1px solid #d9edf7;
+ }
+
+ ul.copy-attributes-grid li label {
+ font-weight: bold;
+ padding-left: 5px;
+ }
</style>
-<div class="container-fluid"><form novalidate class="css-form" name="forms.myForm">
- <div class="row bg-info">
- <div class="col-md-1">
- <h5>[% l('Template') %]</h5>
- </div>
- <div ng-class="template_controls ? 'col-md-2' : 'col-md-5'">
- <eg-basic-combo-box list="template_name_list" selected="template_name"></eg-basic-combo-box>
- </div>
- <div class="col-md-1">
- <button class="btn btn-default " ng-click="applyTemplate(template_name)" type="button">[% l('Apply') %]</button>
- </div>
- <div class="col-md-6" ng-show="template_controls">
- <div class="row">
- <div class="col-md-4">
- <div class="btn-group">
- <label class="btn btn-default" ng-click="saveTemplate(template_name)">[% l('Save') %]</label>
- <label class="btn btn-default" ng-click="deleteTemplate(template_name)">[% l('Delete') %]</label>
- </div>
- </div>
- <div class="col-md-8">
- <div class="btn-group pull-right">
- <span class="btn btn-default btn-file">
- [% l('Import') %]
- <input type="file" eg-file-reader container="imported_templates.data">
- </span>
- <label class="btn btn-default"
- eg-json-exporter container="templates"
- default-file-name="'[% l('exported_copy_templates.json') %]'">
- [% l('Export') %]
- </label>
- </div>
- </div>
- </div>
+
+<div>
+ <form novalidate class="css-form" name="forms.myForm">
+ <div class="row bg-info">
+ <div class="col-md-1">
+ <h5>[% l('Template') %]</h5>
+ </div>
+ <div ng-class="template_controls ? 'col-md-2' : 'col-md-5'">
+ <eg-basic-combo-box list="template_name_list" selected="template_name"></eg-basic-combo-box>
+ </div>
+ <div class="col-md-1">
+ <button class="btn btn-default " ng-click="applyTemplate(template_name)" type="button">[% l('Apply') %]</button>
+ </div>
+ <div class="col-md-6" ng-show="template_controls">
+ <div class="row">
+ <div class="col-md-4">
+ <div class="btn-group">
+ <label class="btn btn-default" ng-click="saveTemplate(template_name)">[% l('Save') %]</label>
+ <label class="btn btn-default" ng-click="deleteTemplate(template_name)">[% l('Delete') %]</label>
+ </div>
</div>
- <div class="col-md-2" ng-class="{'col-md-offset-3' : !template_controls}">
- <button class="btn btn-default pull-right" ng-click="clearWorking()" type="button">[% l('Clear') %]</button>
+ <div class="col-md-8">
+ <div class="btn-group pull-right">
+ <span class="btn btn-default btn-file">
+ [% l('Import') %]
+ <input type="file" eg-file-reader container="imported_templates.data">
+ </span>
+ <label class="btn btn-default"
+ eg-json-exporter container="templates"
+ default-file-name="'[% l('exported_copy_templates.json') %]'">
+ [% l('Export') %]
+ </label>
+ </div>
</div>
+ </div>
</div>
+ <div class="col-md-2" ng-class="{'col-md-offset-3' : !template_controls}">
+ <button class="btn btn-default pull-right" ng-click="clearWorking()" type="button">[% l('Clear') %]</button>
+ </div>
+ </div>
- <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
- <div class="row">
- <div class="col-xs-12">
- <h4 class="center-block">[% l('Call Number Attributes') %]</h4>
- </div>
- </div>
+ <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
+ <div class="row">
+ <div class="col-xs-12">
+ <h4 class="center-block">[% l('Call Number Attributes') %]</h4>
+ </div>
</div>
+ </div>
- <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
- <div class="col-md-1 bg-info">
- <b>[% l('Classification') %]</b>
+ <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
+ <div class="col-md-1 bg-info">
+ <b>[% l('Classification') %]</b>
+ </div>
+ <div class="nullable col-md-2" ng-class="{'bg-success': working.callnumber.classification !== undefined}">
+ <select class="form-control" ng-model="working.callnumber.classification" ng-options="cl.id() as cl.name() for cl in classification_list">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ <div class="col-md-1 bg-info">
+ <b>[% l('Prefix') %]</b>
+ </div>
+ <div class="nullable col-xs-2" ng-class="{'bg-success': working.callnumber.prefix !== undefined}">
+ <select class="form-control" ng-model="working.callnumber.prefix" ng-options="p.id() as p.label() for p in prefix_list">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ <div class="col-md-1 bg-info">
+ <b>[% l('Suffix') %]</b>
+ </div>
+ <div class="nullable col-md-2" ng-class="{'bg-success': working.callnumber.suffix !== undefined}">
+ <select class="form-control" ng-model="working.callnumber.suffix" ng-options="s.id() as s.label() for s in suffix_list">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
+ <div class="row">
+ <div class="col-xs-12">
+ <h4 class="center-block">[% l('Item Attributes') %]</h4>
+ </div>
+ </div>
+ </div>
+
+ <ul class="copy-attributes-grid">
+ <li ng-if="defaults.attributes.circulate">
+ <div class="bg-info"><label>[% l('Circulate?') %]</label></div>
+ <div ng-class="{'bg-success': working.circulate !== undefined}">
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.circulate" value="t"/>
+ [% l('Yes') %]
+ </label>
</div>
- <div class="nullable col-md-2" ng-class="{'bg-success': working.callnumber.classification !== undefined}">
- <select class="form-control" ng-model="working.callnumber.classification" ng-options="cl.id() as cl.name() for cl in classification_list">
- <option value="">[% l('<NONE>') %]</option>
- </select>
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.circulate" value="f"/>
+ [% l('No') %]
+ </label>
</div>
- <div class="col-md-1 bg-info">
- <b>[% l('Prefix') %]</b>
+ </div>
+ <!-- this dummy div ensures each <li> has exactly 3 vertical
+ flex divs, ensuring consistent widget/label height -->
+ <div ng-if="hasMulti()"> </div>
+ </li>
+ <li ng-if="defaults.attributes.status">
+ <div class="bg-info"><label>[% l('Status') %]</label></div>
+ <div ng-class="{'bg-success': working.status !== undefined}">
+ <select class="form-control" ng-model="working.status"
+ ng-options="s.id() as s.name() disable when magic_status_list.indexOf(s.id(),0) > -1 for s in status_list">
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.status.length > 1 && working.status === undefined">
+ <eg-list-counts label="[% l('Multiple statuses') %]"
+ list="working.MultiMap.status" render="statusName"
+ on-select="select_by_status">
+ </eg-list-counts>
</div>
- <div class="nullable col-xs-2" ng-class="{'bg-success': working.callnumber.prefix !== undefined}">
- <select class="form-control" ng-model="working.callnumber.prefix" ng-options="p.id() as p.label() for p in prefix_list">
- <option value="">[% l('<NONE>') %]</option>
- </select>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.circ_lib">
+ <div class="bg-info"><label>[% l('Circulating Library') %]</label></div>
+ <div ng-class="{'bg-success': working.circ_lib !== undefined}">
+ <eg-org-selector
+ alldisabled="{{!defaults.attributes.circ_lib}}"
+ selected="working.circ_lib"
+ noDefault
+ label="[% l('(Unset)') %]"
+ disable-test="cant_have_vols">
+ </eg-org-selector>
+ </div>
+ <div ng-if="hasMulti()">
+ <div
+ ng-if="working.MultiMap.circ_lib.length > 1 && working.circ_lib === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.circ_lib" render="orgShortname"
+ on-select="select_by_circ_lib">
+ </eg-list-counts>
</div>
- <div class="col-md-1 bg-info">
- <b>[% l('Suffix') %]</b>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.ref">
+ <div class="bg-info"><label>[% l('Reference?') %]</label></div>
+ <div ng-class="{'bg-success': working.ref !== undefined}">
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.ref" value="t"/>
+ [% l('Yes') %]
+ </label>
</div>
- <div class="nullable col-md-2" ng-class="{'bg-success': working.callnumber.suffix !== undefined}">
- <select class="form-control" ng-model="working.callnumber.suffix" ng-options="s.id() as s.label() for s in suffix_list">
- <option value="">[% l('<NONE>') %]</option>
- </select>
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.ref" value="f"/>
+ [% l('No') %]
+ </label>
</div>
- </div>
-
- <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
- <div class="row">
- <div class="col-xs-12">
- <h4 class="center-block">[% l('Item Attributes') %]</h4>
- </div>
+ </div>
+ <div ng-if="hasMulti()">
+ <div
+ ng-if="working.MultiMap.ref.length > 1 && working.ref === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.ref" render="labelYesNo" on-select="select_by_ref">
+ </eg-list-counts>
</div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-4">
- <b>[% l('Circulate?') %]</b>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.location">
+ <div class="bg-info"><label>[% l('Shelving Location') %]</label></div>
+ <div ng-class="{'bg-success': working.location !== undefined}">
+ <select class="form-control" ng-model="working.location"
+ ng-options="l.id() as i18n.ou_qualified_location_name(l) for l in location_list">
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div
+ ng-if="working.MultiMap.location.length > 1 && working.location === undefined">
+ <eg-list-counts label="[% l('Multiple locations') %]"
+ list="working.MultiMap.location" render="locationName"
+ on-select="select_by_location"></eg-list-counts>
</div>
- <div class="col-md-4">
- <b>[% l('Status') %]</b>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.opac_visible">
+ <div class="bg-info"><label>[% l('OPAC Visible') %]</label></div>
+ <div ng-class="{'bg-success': working.opac_visible !== undefined}">
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.opac_visible" value="t"/>
+ [% l('Yes') %]
+ </label>
</div>
- <div class="col-md-4">
- <b>[% l('Statistical Categories') %]</b>
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.opac_visible" value="f"/>
+ [% l('No') %]
+ </label>
</div>
- </div>
-
- <div class="row">
- <div class="col-md-8">
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.circulate !== undefined}">
- <div class="row">
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.circulate" ng-model="working.circulate" value="t"/>
- [% l('Yes') %]
- </label>
- </div>
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.circulate" ng-model="working.circulate" value="f"/>
- [% l('No') %]
- </label>
- </div>
- </div>
- <div class="container" ng-show="working.MultiMap.circulate.length > 1 && working.circulate === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.circulate" render="labelYesNo" on-select="select_by_circulate"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.status !== undefined}">
- <select class="form-control"
- ng-disabled="!defaults.attributes.status" ng-model="working.status"
- ng-options="s.id() as s.name() disable when magic_status_list.indexOf(s.id(),0) > -1 for s in status_list">
- </select>
- <div class="container" ng-show="working.MultiMap.status.length > 1 && working.status === undefined">
- <eg-list-counts label="[% l('Multiple statuses') %]" list="working.MultiMap.status" render="statusName" on-select="select_by_status"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Circulation Library') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('Reference?') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.circ_lib !== undefined}">
- <eg-org-selector
- alldisabled="{{!defaults.attributes.circ_lib}}"
- selected="working.circ_lib"
- noDefault
- label="[% l('(Unset)') %]"
- disable-test="cant_have_vols"
- ></eg-org-selector>
- <div class="container" ng-show="working.MultiMap.circ_lib.length > 1 && working.circ_lib === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.circ_lib" render="orgShortname" on-select="select_by_circ_lib"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.ref !== undefined}">
- <div class="row">
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.ref" ng-model="working.ref" value="t"/>
- [% l('Yes') %]
- </label>
- </div>
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.ref" ng-model="working.ref" value="f"/>
- [% l('No') %]
- </label>
- </div>
- </div>
- <div class="container" ng-show="working.MultiMap.ref.length > 1 && working.ref === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.ref" render="labelYesNo" on-select="select_by_ref"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Shelving Location') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('OPAC Visible?') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.location !== undefined}">
- <select class="form-control"
- ng-disabled="!defaults.attributes.location" ng-model="working.location"
- ng-options="l.id() as i18n.ou_qualified_location_name(l) for l in location_list"
- ></select>
- <div class="container" ng-show="working.MultiMap.location.length > 1 && working.location === undefined">
- <eg-list-counts label="[% l('Multiple locations') %]" list="working.MultiMap.location" render="locationName" on-select="select_by_location"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.opac_visible !== undefined}">
- <div class="row">
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.opac_visible" ng-model="working.opac_visible" value="t"/>
- [% l('Yes') %]
- </label>
- </div>
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.opac_visible" ng-model="working.opac_visible" value="f"/>
- [% l('No') %]
- </label>
- </div>
- </div>
- <div class="container" ng-show="working.MultiMap.opac_visible.length > 1 && working.opac_visible === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.opac_visible" render="labelYesNo" on-select="select_by_opac_visible"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Circulation Modifier') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('Price') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="nullable col-md-6" ng-class="{'bg-success': working.circ_modifier !== undefined}">
- <select class="form-control"
- ng-disabled="!defaults.attributes.circ_modifier" ng-model="working.circ_modifier"
- ng-options="m.code() as m.name() for m in circ_modifier_list | orderBy: 'name()'"
- >
- <option value="">[% l('<NONE>') %]</option>
- </select>
- <div class="container" ng-show="working.MultiMap.circ_modifier.length > 1 && working.circ_modifier === undefined">
- <eg-list-counts label="[% l('Multiple modifiers') %]" list="working.MultiMap.circ_modifier" render="circmodName" on-select="select_by_circ_modifier"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.price !== undefined}">
- <input class="form-control" ng-disabled="!defaults.attributes.price" str-to-float ng-model="working.price" type="number" step="0.01"/>
- <div class="container" ng-show="working.MultiMap.price.length > 1 && working.price === undefined">
- <eg-list-counts label="[% l('Multiple prices') %]" list="working.MultiMap.price" on-select="select_by_price"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Loan Duration') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('Acquisition Cost') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.loan_duration !== undefined}">
- <select class="form-control" int-to-str ng-disabled="!defaults.attributes.loan_duration" ng-model="working.loan_duration">
- <option value="1">[% l('Short') %]</option>
- <option value="2" selected>[% l('Normal') %]</option>
- <option value="3">[% l('Extended') %]</option>
- </select>
- <div class="container" ng-show="working.MultiMap.loan_duration.length > 1 && working.loan_duration === undefined">
- <eg-list-counts label="[% l('Multiple durations') %]" list="working.MultiMap.loan_duration" render="durationLabel" on-select="select_by_loan_duration"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.cost !== undefined}">
- <input class="form-control" ng-disabled="!defaults.attributes.cost" str-to-float ng-model="working.cost" type="number" step="0.01"/>
- <div class="container" ng-show="working.MultiMap.cost.length > 1 && working.cost === undefined">
- <eg-list-counts label="[% l('Multiple costs') %]" list="working.MultiMap.cost" on-select="select_by_cost"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Circulate as Type') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('Deposit?') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="nullable col-md-6" ng-class="{'bg-success': working.circ_as_type !== undefined}">
- <select class="form-control"
- ng-disabled="!defaults.attributes.circ_as_type" ng-model="working.circ_as_type"
- ng-options="t.code() as t.value() for t in circ_type_list">
- <option value="">[% l('<NONE>') %]</option>
- </select>
- <div class="container" ng-show="working.MultiMap.circ_as_type.length > 1 && working.circ_as_type === undefined">
- <eg-list-counts label="[% l('Multiple types') %]" list="working.MultiMap.circ_as_type" render="circTypeValue" on-select="select_by_circ_as_type"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.deposit !== undefined}">
- <div class="row">
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.deposit" ng-model="working.deposit" value="t"/>
- [% l('Yes') %]
- </label>
- </div>
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.deposit" ng-model="working.deposit" value="f"/>
- [% l('No') %]
- </label>
- </div>
- </div>
- <div class="container" ng-show="working.MultiMap.deposit.length > 1 && working.deposit === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.deposit" render="labelYesNo" on-select="select_by_deposit"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Holdable?') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('Deposit Amount') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.holdable !== undefined}">
- <div class="row">
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.holdable" ng-model="working.holdable" value="t"/>
- [% l('Yes') %]
- </label>
- </div>
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.holdable" ng-model="working.holdable" value="f"/>
- [% l('No') %]
- </label>
- </div>
- </div>
- <div class="container" ng-show="working.MultiMap.holdable.length > 1 && working.holdable === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.holdable" render="labelYesNo" on-select="select_by_holdable"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.deposit_amount !== undefined}">
- <input class="form-control" ng-disabled="!defaults.attributes.deposit_amount" str-to-float ng-model="working.deposit_amount" type="number" step="0.01"/>
- <div class="container" ng-show="working.MultiMap.deposit_amount.length > 1 && working.deposit_amount === undefined">
- <eg-list-counts label="[% l('Multiple amounts') %]" list="working.MultiMap.deposit_amount" on-select="select_by_deposit_amount"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Age-based Hold Protection') %]</b>
- </div>
- <div class="col-md-6">
- <b>[% l('Quality') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.age_protect !== undefined}">
- <select class="form-control"
- ng-disabled="!defaults.attributes.age_protect" ng-model="working.age_protect"
- ng-options="a.id() as a.name() for a in age_protect_list">
- <option value="">[% l('<NONE>') %]</option>
- </select>
- <div class="container" ng-show="working.MultiMap.age_protect.length > 1 && working.age_protect === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.age_protect" render="ageprotectName" on-select="select_by_age_protect"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6" ng-class="{'bg-success': working.mint_condition !== undefined}">
- <div class="row">
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.mint_condition" ng-model="working.mint_condition" value="t"/>
- [% l('Good') %]
- </label>
- </div>
- <div class="col-xs-3">
- <label>
- <input type="radio" ng-disabled="!defaults.attributes.mint_condition" ng-model="working.mint_condition" value="f"/>
- [% l('Damaged') %]
- </label>
- </div>
- </div>
- <div class="container" ng-show="working.MultiMap.mint_condition.length > 1 && working.mint_condition === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.mint_condition" render="labelYesNo" on-select="select_by_mint_condition"></eg-list-counts>
- </div>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Fine Level') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.fine_level !== undefined}">
- <select class="form-control" int-to-str ng-disabled="!defaults.attributes.fine_level" ng-model="working.fine_level">
- <option value="1">[% l('Low') %]</option>
- <option value="2" selected>[% l('Normal') %]</option>
- <option value="3">[% l('High') %]</option>
- </select>
- <div class="container" ng-show="working.MultiMap.fine_level.length > 1 && working.fine_level === undefined">
- <eg-list-counts label="[% l('Multiple levels') %]" list="working.MultiMap.fine_level" render="fineLabel" on-select="select_by_fine_level"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6">
- <button
- class="btn btn-default"
- ng-disabled="!defaults.copy_notes"
- ng-click="copy_notes_dialog(workingGridControls.selectedItems())"
- type="button">
- [% l('Item Notes') %]
- </button>
- <button
- class="btn btn-default"
- ng-disabled="!defaults.attributes.alerts"
- ng-click="copy_alerts_dialog(workingGridControls.selectedItems())"
- type="button">
- [% l('Item Alerts') %]
- </button>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row bg-info">
- <div class="col-md-6">
- <b>[% l('Floating') %]</b>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6" ng-class="{'bg-success': working.floating !== undefined}">
- <select class="form-control"
- ng-disabled="!defaults.attributes.floating" ng-model="working.floating"
- ng-options="a.id() as a.name() for a in floating_list">
- <option value="">[% l('<NONE>') %]</option>
- </select>
- <div class="container" ng-show="working.MultiMap.floating.length > 1 && working.floating === undefined">
- <eg-list-counts label="[% l('Multiple values') %]" list="working.MultiMap.floating" render="floatingName" on-select="select_by_floating"></eg-list-counts>
- </div>
- </div>
- <div class="col-md-6">
- <button
- class="btn btn-default"
- ng-disabled="!defaults.copy_tags"
- ng-click="copy_tags_dialog(workingGridControls.selectedItems())"
- type="button">
- [% l('Item Tags') %]
- </button>
- </div>
- </div>
+ </div>
+ <div ng-if="hasMulti()">
+ <div
+ ng-if="working.MultiMap.opac_visible.length > 1 && working.opac_visible === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.opac_visible" render="labelYesNo"
+ on-select="select_by_opac_visible"></eg-list-counts>
</div>
-
- <div class="col-md-4">
- <div class="row">
- <div class="col-xs-12">
- <select class="form-control" ng-disabled="!defaults.statcats"
- ng-model="working.statcat_filter"
- ng-options="o.id() as o.shortname() for o in statcat_filter_list">
- <option value="">[% l('Filter by Library') %]</option>
- </select>
- </div>
- </div>
-
- <div class="row pad-vert"></div>
-
- <div class="row" ng-repeat="sc in statcats" ng-show="statcat_visible(sc.owner().id())">
- <div class="col-xs-12">
- <div class="row bg-info">
- <div class="col-xs-12">
- <span>{{ sc.owner().name() }} : {{ sc.name() }}</span>
- </div>
- </div>
- <div class="row">
- <div class="nullable col-xs-12" ng-class="{'bg-success': working.statcats[sc.id()] !== undefined}">
- <select class="form-control" ng-disabled="!defaults.statcats"
- ng-change="statcatUpdate(sc.id())"
- ng-model="working.statcats[sc.id()]"
- ng-options="e.id() as e.value() for e in sc.entries()"
- ng-required="sc.required() == 't' && !working.statcats_multi[sc.id()]">
- <option value="">
- {{ !working.statcats_multi[sc.id()] ? '[% l('<NONE>') %]' : '[% l('<MULTIPLE>') %]' }}
- </option>
- </select>
- </div>
- </div>
- </div>
- </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.circ_modifier">
+ <div class="bg-info"><label>[% l('OPAC Visible') %]</label></div>
+ <div ng-class="{'bg-success': working.circ_modifier !== undefined}">
+ <select class="form-control"
+ ng-model="working.circ_modifier"
+ ng-options="m.code() as m.name() for m in circ_modifier_list | orderBy: 'name()'">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.circ_modifier.length > 1 && working.circ_modifier === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.circ_modifier" render="labelYesNo"
+ on-select="select_by_circ_modifier"></eg-list-counts>
</div>
-
- </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.price">
+ <div class="bg-info"><label>[% l('Price') %]</label></div>
+ <div ng-class="{'bg-success': working.price !== undefined}">
+ <input class="form-control" str-to-float ng-model="working.price"
+ type="number" step="0.01"/>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.price.length > 1 && working.price === undefined">
+ <eg-list-counts label="[% l('Multiple prices') %]"
+ list="working.MultiMap.price" on-select="select_by_price">
+ </eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.loan_duration">
+ <div class="bg-info"><label>[% l('Loan Duration') %]</label></div>
+ <div ng-class="{'bg-success': working.loan_duration !== undefined}">
+ <select class="form-control" int-to-str ng-model="working.loan_duration">
+ <option value="1">[% l('Short') %]</option>
+ <option value="2" selected>[% l('Normal') %]</option>
+ <option value="3">[% l('Extended') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-show="working.MultiMap.loan_duration.length > 1 && working.loan_duration === undefined">
+ <eg-list-counts label="[% l('Multiple durations') %]"
+ list="working.MultiMap.loan_duration" render="durationLabel"
+ on-select="select_by_loan_duration"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.cost">
+ <div class="bg-info"><label>[% l('Acquisitions Cost') %]</label></div>
+ <div ng-class="{'bg-success': working.cost !== undefined}">
+ <input class="form-control" str-to-float ng-model="working.cost"
+ type="number" step="0.01"/>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.cost.length > 1 && working.cost === undefined">
+ <eg-list-counts label="[% l('Multiple costs') %]"
+ list="working.MultiMap.cost" on-select="select_by_cost">
+ </eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.circ_as_type">
+ <div class="bg-info"><label>[% l('Circulate as Type') %]</label></div>
+ <div ng-class="{'bg-success': working.circ_as_type !== undefined}">
+ <select class="form-control" ng-model="working.circ_as_type"
+ ng-options="t.code() as t.value() for t in circ_type_list">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.circ_as_type.length > 1 && working.circ_as_type === undefined">
+ <eg-list-counts label="[% l('Multiple types') %]"
+ list="working.MultiMap.circ_as_type" render="circTypeValue"
+ on-select="select_by_circ_as_type">
+ </eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.holdable">
+ <div class="bg-info"><label>[% l('Holdable?') %]</label></div>
+ <div ng-class="{'bg-success': working.holdable !== undefined}">
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.holdable" value="t"/>
+ [% l('Yes') %]
+ </label>
+ </div>
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.holdable" value="f"/>
+ [% l('No') %]
+ </label>
+ </div>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-show="working.MultiMap.holdable.length > 1 && working.holdable === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.holdable" render="labelYesNo"
+ on-select="select_by_holdable"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.deposit">
+ <div class="bg-info"><label>[% l('Deposit?') %]</label></div>
+ <div ng-class="{'bg-success': working.deposit !== undefined}">
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.deposit" value="t"/>
+ [% l('Yes') %]
+ </label>
+ </div>
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.deposit" value="f"/>
+ [% l('No') %]
+ </label>
+ </div>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.deposit.length > 1 && working.deposit === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.deposit" render="labelYesNo"
+ on-select="select_by_deposit"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.deposit_amount">
+ <div class="bg-info"><label>[% l('Deposit Amount?') %]</label></div>
+ <div ng-class="{'bg-success': working.deposit_amount !== undefined}">
+ <input class="form-control" str-to-float
+ ng-model="working.deposit_amount" type="number" step="0.01"/>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.deposit_amount.length > 1 && working.deposit_amount === undefined">
+ <eg-list-counts label="[% l('Multiple amounts') %]"
+ list="working.MultiMap.deposit_amount"
+ on-select="select_by_deposit_amount"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.age_protect">
+ <div class="bg-info"><label>[% l('Age-based Hold Protection') %]</label></div>
+ <div ng-class="{'bg-success': working.age_protect !== undefined}">
+ <select class="form-control"
+ ng-model="working.age_protect"
+ ng-options="a.id() as a.name() for a in age_protect_list">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.age_protect.length > 1 && working.age_protect === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.age_protect" render="ageprotectName"
+ on-select="select_by_age_protect"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.mint_condition">
+ <div class="bg-info"><label>[% l('Quality') %]</label></div>
+ <div ng-class="{'bg-success': working.mint_condition !== undefined}">
+ <div class="col-lg-6">
+ <label>
+ <input type="radio" ng-model="working.mint_condition" value="t"/>
+ [% l('Good') %]
+ </label>
+ </div>
+ <div class="col-lg-6">
+ <label>
+ <input type="radio"ng-model="working.mint_condition" value="f"/>
+ [% l('Damaged') %]
+ </label>
+ </div>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.mint_condition.length > 1 && working.mint_condition === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.mint_condition" render="labelYesNo"
+ on-select="select_by_mint_condition"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.attributes.fine_level">
+ <div class="bg-info"><label>[% l('Fine Level') %]</label></div>
+ <div ng-class="{'bg-success': working.fine_level !== undefined}">
+ <select class="form-control" int-to-str ng-model="working.fine_level">
+ <option value="1">[% l('Low') %]</option>
+ <option value="2" selected>[% l('Normal') %]</option>
+ <option value="3">[% l('High') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.fine_level.length > 1 && working.fine_level === undefined">
+ <eg-list-counts label="[% l('Multiple levels') %]"
+ list="working.MultiMap.fine_level" render="fineLabel"
+ on-select="select_by_fine_level"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.copy_notes">
+ <div class="bg-info"><label>[% l('Item Notes') %]</label></div>
+ <div ng-class="{'bg-success': working.copy_notes !== undefined}">
+ <button class="btn btn-default" type="button"
+ ng-click="copy_notes_dialog(workingGridControls.selectedItems())">
+ [% l('Item Notes') %]
+ </button>
+ </div>
+ <div ng-if="hasMulti()"> </div>
+ </li>
+ <li ng-if="defaults.attributes.alerts">
+ <div class="bg-info"><label>[% l('Item Notes') %]</label></div>
+ <div ng-class="{'bg-success': working.alerts !== undefined}">
+ <button class="btn btn-default" type="button"
+ ng-click="copy_alerts_dialog(workingGridControls.selectedItems())">
+ [% l('Item Alerts') %]
+ </button>
+ </div>
+ <div ng-if="hasMulti()"> </div>
+ </li>
+ <li ng-if="defaults.attributes.floating">
+ <div class="bg-info"><label>[% l('Floating') %]</label></div>
+ <div ng-class="{'bg-success': working.floating !== undefined}">
+ <select class="form-control" ng-model="working.floating"
+ ng-options="a.id() as a.name() for a in floating_list">
+ <option value="">[% l('<NONE>') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()">
+ <div ng-if="working.MultiMap.floating.length > 1 && working.floating === undefined">
+ <eg-list-counts label="[% l('Multiple values') %]"
+ list="working.MultiMap.floating" render="floatingName"
+ on-select="select_by_floating"></eg-list-counts>
+ </div>
+ </div>
+ </li>
+ <li ng-if="defaults.copy_tags">
+ <div class="bg-info"><label>[% l('Item Tags') %]</label></div>
+ <div ng-class="{'bg-success': working.copy_tags !== undefined}">
+ <button
+ class="btn btn-default"
+ ng-click="copy_tags_dialog(workingGridControls.selectedItems())"
+ type="button">
+ [% l('View/Edit Item Tags') %]
+ </button>
+ </div>
+ <div ng-if="hasMulti()"> </div>
+ </li>
+ <li ng-if="defaults.statcats">
+ <div class="bg-info"><label>[% l('Statistical Categories') %]</label></div>
+ <div>
+ <select class="form-control" ng-disabled="!defaults.statcats"
+ ng-model="working.statcat_filter"
+ ng-options="o.id() as o.shortname() for o in statcat_filter_list">
+ <option value="">[% l('Filter by Library') %]</option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()"> </div>
+ </li>
+
+ <li ng-repeat="sc in statcats" ng-if="statcat_visible(sc.owner().id())">
+ <div class="bg-info"><label>{{sc.owner().name() }} : {{ sc.name()}}</label></div>
+ <div ng-class="{'bg-success': working.statcats[sc.id()] !== undefined}">
+ <select class="form-control" ng-disabled="!defaults.statcats"
+ ng-change="statcatUpdate(sc.id())"
+ ng-model="working.statcats[sc.id()]"
+ ng-options="e.id() as e.value() for e in sc.entries()"
+ ng-required="sc.required() == 't' && !working.statcats_multi[sc.id()]">
+ <option value="">
+ {{ !working.statcats_multi[sc.id()] ? '[% l('<NONE>') %]' : '[% l('<MULTIPLE>') %]' }}
+ </option>
+ </select>
+ </div>
+ <div ng-if="hasMulti()"> </div>
+ </li>
+ </ul>
</div>
</form></div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index 7d32580f40..e62e1b2622 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -101,11 +101,16 @@
<div class="tab-content">
<div class="tab-pane active">
<div ng-show="copytab == 'working'">
-
+
<div class="container-fluid"> <!-- working copy editor -->
+ <div class="row give-cell-border" style="margin:0px;padding:0px">
+ <div class="col-lg-12" style="margin:0px;padding:0px"
+ <div ng-include="'[% ctx.base_path %]/staff/cat/volcopy/t_attr_edit'"></div>
+ </div>
+ </div>
<div class="row">
- <div class="col-lg-4">
-
+ <div class="col-lg-12">
+
<eg-grid
id-field="id"
idl-class="acp"
@@ -116,13 +121,13 @@
after-select="afterItemSelect"
persist-key="cat.volcopy.copies"
dateformat="{{$root.egDateAndTimeFormat}}">
-
+
<eg-grid-menu-item disabled="disableSave" handler="workingToComplete"
label="[% l('Store Selected') %]"></eg-grid-menu-item>
<eg-grid-menu-item disabled="disableSave" handler="workingSaveAndExit"
label="[% l('Save & Exit') %]"></eg-grid-menu-item>
-
-
+
+
<eg-grid-field label="[% l('Barcode') %]" path='barcode' visible></eg-grid-field>
<eg-grid-field label="[% l('Created') %]" path="create_date" datatype="timestamp" visible></eg-grid-field>
<eg-grid-field label="[% l('Activated') %]" path="active_date" visible></eg-grid-field>
@@ -130,18 +135,13 @@
<eg-grid-field label="[% l('Call Number') %]" path="call_number.label" visible></eg-grid-field>
<eg-grid-field label="[% l('CN Suffix') %]" path="call_number.suffix.label" visible></eg-grid-field>
<eg-grid-field label="[% l('Item ID') %]" path="id" hidden></eg-grid-field>
-
+
</eg-grid>
-
- </div>
-
- <div class="col-lg-8 give-cell-border">
- <div ng-include="'[% ctx.base_path %]/staff/cat/volcopy/t_attr_edit'"></div>
+
</div>
</div>
</div>
-
- </div>
+
<div ng-show="copytab == 'complete'">
<eg-grid
id-field="id"
@@ -152,15 +152,15 @@
grid-controls="completedGridControls"
persist-key="cat.volcopy.copies.complete"
dateformat="{{$root.egDateAndTimeFormat}}">
-
+
<eg-grid-menu-item standalone="true" handler="completeToWorking"
label="[% l('Edit Selected') %]"></eg-grid-menu-item>
-
+
<eg-grid-menu-item disabled="disableSave" handler="saveAndContinue"
label="[% l('Save Completed') %]"></eg-grid-menu-item>
<eg-grid-menu-item disabled="disableSave" handler="saveAndExit"
label="[% l('Save & Exit') %]"></eg-grid-menu-item>
-
+
<eg-grid-field label="[% l('Barcode') %]" path='barcode' visible></eg-grid-field>
<eg-grid-field label="[% l('Created') %]" path="create_date" datatype="timestamp" visible></eg-grid-field>
<eg-grid-field label="[% l('Activated') %]" path="active_date" datatype="timestamp" visible></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 20c825746e..0a85f4cd18 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -1173,6 +1173,19 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
statcat_filter: undefined
};
+ // Returns true if we are editing multiple copies and at least
+ // one field contains multiple values.
+ $scope.hasMulti = function() {
+ var keys = Object.keys($scope.working.MultiMap);
+ // for-loop for shortcut exit
+ for (var i = 0; i < keys.length; i++) {
+ if ($scope.working.MultiMap[keys[i]].length > 1) {
+ return true;
+ }
+ }
+ return false;
+ }
+
$scope.copyAlertUpdate = function (alerts) {
if (!$scope.in_item_select &&
$scope.workingGridControls &&
-----------------------------------------------------------------------
Summary of changes:
.../templates/staff/cat/volcopy/t_attr_edit.tt2 | 992 +++++++++++----------
.../src/templates/staff/cat/volcopy/t_edit.tt2 | 34 +-
.../web/js/ui/default/staff/cat/volcopy/app.js | 13 +
.../Cataloging/copy-edit-hide-defaults.adoc | 15 +
4 files changed, 547 insertions(+), 507 deletions(-)
create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/copy-edit-hide-defaults.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list