[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1d18f19c11990a3d17377bbadc479f4080261135

[Evergreen Git]

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  1d18f19c11990a3d17377bbadc479f4080261135 (commit)
       via  8669b1c730bf9988bfe9c9b41f28753adb6c7a10 (commit)
       via  97bbbdf323818795d38fdefe5fe71b6f3b97ea3e (commit)
      from  9e67c5bead547ffbc73cb5767a746ee25cb2f144 (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 1d18f19c11990a3d17377bbadc479f4080261135
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Thu Sep 18 12:49:45 2014 -0400

    LP#1234927: Pluralizing link names to follow convention.
    
    Based on feedback from Mike Rylander on the Launchpad ticket.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 870497c..40fd709 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6506,8 +6506,8 @@ SELECT  usr,
 			<field reporter:label="Copy Notes" name="notes" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Stat-Cat entry maps" name="stat_cat_entry_copy_maps" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Circulations" name="circulations" oils_persist:virtual="true" reporter:datatype="link"/>
-			<field reporter:label="Aged (patronless) Circulations" name="aged_circulation" oils_persist:virtual="true" reporter:datatype="link"/>
-			<field reporter:label="Combined Aged and Active Circulations" name="all_circulation" oils_persist:virtual="true" reporter:datatype="link"/>
+			<field reporter:label="Aged (patronless) Circulations" name="aged_circulations" oils_persist:virtual="true" reporter:datatype="link"/>
+			<field reporter:label="Combined Aged and Active Circulations" name="all_circulations" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Total Circulations" name="total_circ_count" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Last Circulation Date" name="last_circ" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Holds" name="holds" oils_persist:virtual="true" reporter:datatype="link"/>
@@ -6530,8 +6530,8 @@ SELECT  usr,
 			<link field="notes" reltype="has_many" key="owning_copy" map="" class="acpn"/>
 			<link field="stat_cat_entries" reltype="has_many" key="owning_copy" map="stat_cat_entry" class="ascecm"/>
 			<link field="circulations" reltype="has_many" key="target_copy" map="" class="circ"/>
-			<link field="aged_circulation" reltype="has_many" key="target_copy" map="" class="acirc"/>
-			<link field="all_circulation" reltype="has_many" key="target_copy" map="" class="combcirc"/>
+			<link field="aged_circulations" reltype="has_many" key="target_copy" map="" class="acirc"/>
+			<link field="all_circulations" reltype="has_many" key="target_copy" map="" class="combcirc"/>
 			<link field="total_circ_count" reltype="might_have" key="id" map="" class="erfcc"/>
 			<link field="last_circ" reltype="might_have" key="id" map="" class="rlc"/>
 			<link field="circ_modifier" reltype="has_a" key="code" map="" class="ccm"/>

commit 8669b1c730bf9988bfe9c9b41f28753adb6c7a10
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Thu Sep 18 10:16:20 2014 -0400

    LP#1234927 Reporter needs Item -> Combined Aged and Active Circulations link
    
    There is a need for item usage statistics that include more than just active
    circulations.  I have included links to both Aged (patronless) Circulations
    and to Combined Aged and Active Circulations sources.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index a0c3e8b..870497c 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6506,6 +6506,8 @@ SELECT  usr,
 			<field reporter:label="Copy Notes" name="notes" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Stat-Cat entry maps" name="stat_cat_entry_copy_maps" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Circulations" name="circulations" oils_persist:virtual="true" reporter:datatype="link"/>
+			<field reporter:label="Aged (patronless) Circulations" name="aged_circulation" oils_persist:virtual="true" reporter:datatype="link"/>
+			<field reporter:label="Combined Aged and Active Circulations" name="all_circulation" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Total Circulations" name="total_circ_count" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Last Circulation Date" name="last_circ" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Holds" name="holds" oils_persist:virtual="true" reporter:datatype="link"/>
@@ -6528,6 +6530,8 @@ SELECT  usr,
 			<link field="notes" reltype="has_many" key="owning_copy" map="" class="acpn"/>
 			<link field="stat_cat_entries" reltype="has_many" key="owning_copy" map="stat_cat_entry" class="ascecm"/>
 			<link field="circulations" reltype="has_many" key="target_copy" map="" class="circ"/>
+			<link field="aged_circulation" reltype="has_many" key="target_copy" map="" class="acirc"/>
+			<link field="all_circulation" reltype="has_many" key="target_copy" map="" class="combcirc"/>
 			<link field="total_circ_count" reltype="might_have" key="id" map="" class="erfcc"/>
 			<link field="last_circ" reltype="might_have" key="id" map="" class="rlc"/>
 			<link field="circ_modifier" reltype="has_a" key="code" map="" class="ccm"/>

commit 97bbbdf323818795d38fdefe5fe71b6f3b97ea3e
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Thu Sep 18 11:08:18 2014 -0400

    LP#1371173: Reporter: Classic Item List needs link to Item source
    
    Add a link on the reporter.classic_item_list fieldmapper definition
    to asset.copy.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index cd156a6..a0c3e8b 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -10851,6 +10851,7 @@ SELECT  usr,
         </fields>
         <links>
             <link field="owning_lib" reltype="has_a" key="id" map="" class="aou"/>
+            <link field="id" reltype="has_a" key="id" map="" class="acp"/>
             <link field="circ_lib" reltype="has_a" key="id" map="" class="aou"/>
             <link field="creator" reltype="has_a" key="id" map="" class="au"/>
             <link field="age_protect" reltype="has_a" key="id" map="" class="crahp"/>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/fm_IDL.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS