[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8278aab39dbac66daa28c6fc181bbef01b9e435d

[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  8278aab39dbac66daa28c6fc181bbef01b9e435d (commit)
       via  1ce24362d08ecc595430f3784574ab7d940c47c8 (commit)
      from  06b170f908764312b59414ffce340c955fa94dfc (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 8278aab39dbac66daa28c6fc181bbef01b9e435d
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon May 1 15:16:32 2017 -0400

    LP#1230301: add release notes
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/docs/RELEASE_NOTES_NEXT/Reports/Link_User_and_Working_Location_Sources.adoc b/docs/RELEASE_NOTES_NEXT/Reports/Link_User_and_Working_Location_Sources.adoc
new file mode 100644
index 0000000..6ef6225
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Reports/Link_User_and_Working_Location_Sources.adoc
@@ -0,0 +1,5 @@
+Link ILS User and Working Location Reporting Sources
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The Working Location reporting source now has labels
+and it is now linked to the ILS User reporting source, allowing
+reports to display or filter on staff working location.

commit 1ce24362d08ecc595430f3784574ab7d940c47c8
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Tue Feb 9 19:12:11 2016 -0500

    LP#1230301 - Add User/Working Location Map Link to the ILS User reports source.
    
    For certain reports it is desirable to display or filter on staff Working Location.
    This adds a link to the permission.usr_work_ou_map table/source in fm_IDL.xml.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 4c1ed76..b3db8b1 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3380,6 +3380,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="Fund Allocation Percentages" name="fund_alloc_pcts" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Reservations" name="reservations" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="User Activity Entries" name="usr_activity" oils_persist:virtual="true" reporter:datatype="link"/>
+			<field reporter:label="User/Working Location Map" name="usr_work_ou_map" oils_persist:virtual="true" reporter:datatype="link"/>
 		</fields>
 		<links>
 			<link field="demographic" reltype="might_have" key="id" map="" class="rud"/>
@@ -3412,6 +3413,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="fund_alloc_pcts" reltype="has_many" key="allocator" map="" class="acqfap"/>
 			<link field="reservations" reltype="has_many" key="usr" map="" class="bresv"/>
 			<link field="usr_activity" reltype="has_many" key="usr" map="" class="auact"/>
+			<link field="usr_work_ou_map" reltype="has_many" key="usr" map="" class="puwoum"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
 			<actions>
@@ -7152,9 +7154,9 @@ SELECT  usr,
 	</class>
 	<class id="puwoum" controller="open-ils.cstore" oils_obj:fieldmapper="permission::usr_work_ou_map" oils_persist:tablename="permission.usr_work_ou_map" reporter:label="User Work Org Unit Map">
 		<fields oils_persist:primary="id" oils_persist:sequence="permission.usr_work_ou_map_id_seq">
-			<field name="id" reporter:datatype="int" />
-			<field name="usr" reporter:datatype="link"/>
-			<field name="work_ou" reporter:datatype="link"/>
+			<field reporter:label="User/Working Location Map ID" name="id" reporter:datatype="int" />
+			<field reporter:label="User" name="usr" reporter:datatype="link"/>
+			<field reporter:label="Working Location" name="work_ou" reporter:datatype="link"/>
 		</fields>
 		<links>
 			<link field="usr" reltype="has_a" key="id" map="" class="au"/>

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

Summary of changes:
 Open-ILS/examples/fm_IDL.xml                       |    8 +++++---
 .../Link_User_and_Working_Location_Sources.adoc    |    5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Reports/Link_User_and_Working_Location_Sources.adoc


hooks/post-receive
-- 
Evergreen ILS