From: senator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 16 Dec 2010 18:40:42 +0000 (+0000)
Subject: Backport r18852, r19005 from trunk
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=053763412b5a715f275a452072fd1b732d595915;p=evergreen%2Fjoelewis.git

Backport r18852, r19005 from trunk

[18852] Serials: make some IDL changes and some changes to field order in an
AutoGrid to support easier creation of working copy templates with serials.

[19005] Serials: the circ_lib field on a copy template has no meaning in the
only context where these copy templates are used, which is serials.  Any
copy-like objects that are created in serials have their circ_lib determined
by distribution.holding_lib

So remove the circ_lib from the interface.



git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@19006 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 723e9c133e..80b5051d84 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4497,7 +4497,7 @@ SELECT  usr,
 			<field reporter:label="Name" name="name" reporter:datatype="text"/>
 			<field reporter:label="Circ Lib" name="circ_lib" reporter:datatype="link"/>
 			<field reporter:label="Status" name="status" reporter:datatype="int"/>
-			<field reporter:label="Location" name="location" reporter:datatype="int"/>
+			<field reporter:label="Location" name="location" reporter:datatype="link"/>
 			<field reporter:label="Loan Duration" name="loan_duration" reporter:datatype="int"/>
 			<field reporter:label="Fine Level" name="fine_level" reporter:datatype="int"/>
 			<field reporter:label="Age Protect" name="age_protect" reporter:datatype="int"/>
@@ -4507,7 +4507,7 @@ SELECT  usr,
 			<field reporter:label="Holdable?" name="holdable" reporter:datatype="bool"/>
 			<field reporter:label="Deposit Amount" name="deposit_amount" reporter:datatype="money"/>
 			<field reporter:label="Price" name="price" reporter:datatype="money"/>
-			<field reporter:label="Circ Modifier" name="circ_modifier" reporter:datatype="text"/>
+			<field reporter:label="Circ Modifier" name="circ_modifier" reporter:datatype="link"/>
 			<field reporter:label="Circ As Type" name="circ_as_type" reporter:datatype="text"/>
 			<field reporter:label="Alert Message" name="alert_message" reporter:datatype="text"/>
 			<field reporter:label="OPAC Visible?" name="opac_visible" reporter:datatype="bool"/>
@@ -4519,6 +4519,8 @@ SELECT  usr,
 			<link field="creator" reltype="has_a" key="id" map="" class="au"/>
 			<link field="editor" reltype="has_a" key="id" map="" class="au"/>
 			<link field="circ_lib" reltype="has_a" key="id" map="" class="aou"/>
+			<link field="circ_modifier" reltype="has_a" key="code" map="" class="ccm"/>
+			<link field="location" reltype="has_a" key="id" map="" class="acpl"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
 			<actions>
diff --git a/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2 b/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
index 37a360d00b..f36feb401c 100644
--- a/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
+++ b/Open-ILS/web/templates/default/conify/global/asset/copy_template.tt2
@@ -22,9 +22,9 @@
     </div>
     <table jsId="actGrid"
         dojoType="openils.widget.AutoGrid"
-        fieldOrder="['name', 'owning_lib']"
-        suppressFields="['creator','editor','edit_date','create_date']"
-        suppressEditFields="['creator','editor','edit_date','create_date']"
+        fieldOrder="['name','owning_lib','circulate','holdable','opac_visible','loan_duration','fine_level','location','circ_modifier','floating','deposit','ref','mint_condition']"
+        suppressFields="['creator','editor','edit_date','create_date','circ_lib']"
+        suppressEditFields="['creator','editor','edit_date','create_date','circ_lib']"
         query="{id: '*'}"
         editStyle="pane"
         fmClass="act"