From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 6 Aug 2018 15:35:44 +0000 (-0400)
Subject: LP#1744756 Grp display tree minor fixes.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c5e8a84e54af6fd925fe047c40e53559f6ae8d6e;p=contrib%2FConifer.git

LP#1744756 Grp display tree minor fixes.

1. Fix group tree display entry IDL sequence copy/paste issue:

permission.grp_tree_id_seq => permission.grp_tree_display_entry_id_seq

2. Apply consistent use of tabs in the IDL.

3. Fix thinko use of grp as a function in the no-entries-exist scenario
   in the patron editor.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index b12a0438f9..eb447a4f0d 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -7645,13 +7645,13 @@ SELECT  usr,
         </permacrud>
 	</class>
 	<class id="pgtde" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="permission::grp_tree_display_entry" oils_persist:tablename="permission.grp_tree_display_entry" reporter:label="Permission Group Tree Display Entry">
-		<fields oils_persist:primary="id" oils_persist:sequence="permission.grp_tree_id_seq">
+		<fields oils_persist:primary="id" oils_persist:sequence="permission.grp_tree_display_entry_id_seq">
 			<field reporter:label="Entry ID" name="id" reporter:selector="name" reporter:datatype="id"/>
 			<field reporter:label="Group ID" name="grp" reporter:datatype="link" oils_persist:i18n="true"/>
 			<field reporter:label="Parent Group" name="parent" reporter:datatype="link"/>
 			<field reporter:label="Org Unit" name="org" reporter:datatype="link"/>
-            <field reporter:label="Position" name="position" reporter:datatype="int"/>
-            <field reporter:label="Disabled" name="disabled" reporter:datatype="bool"/>
+			<field reporter:label="Position" name="position" reporter:datatype="int"/>
+			<field reporter:label="Disabled" name="disabled" reporter:datatype="bool"/>
 			<field reporter:label="Child Entries" name="children" oils_persist:virtual="true" reporter:datatype="link"/>
 		</fields>
 		<links>
@@ -7660,14 +7660,14 @@ SELECT  usr,
 			<link field="org" reltype="has_a" key="id" map="" class="aou"/>
 			<link field="children" reltype="has_many" key="parent" map="" class="pgtde"/>
 		</links>
-        <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
-            <actions>
-                <create permission="CREATE_PERM" global_required="true"/>
-                <retrieve permission="STAFF_LOGIN" global_required="true"/>
-                <update permission="UPDATE_PERM" global_required="true"/>
-                <delete permission="DELETE_PERM" global_required="true"/>
-            </actions>
-        </permacrud>
+		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+			<actions>
+				<create permission="CREATE_PERM" global_required="true"/>
+				<retrieve permission="STAFF_LOGIN" global_required="true"/>
+				<update permission="UPDATE_PERM" global_required="true"/>
+				<delete permission="DELETE_PERM" global_required="true"/>
+			</actions>
+		</permacrud>
 	</class>
 	<class id="asva" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="action::survey_answer" oils_persist:tablename="action.survey_answer" reporter:label="Survey Answer">
 		<fields oils_persist:primary="id" oils_persist:sequence="action.survey_answer_id_seq">
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 85e5bdb44f..bd58914c3c 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -465,7 +465,7 @@ within the "form" by name for validation.
             ng-click="set_profile(entry.grp())">{{entry.grp().name()}}</a>
         </li>
         <li ng-repeat="grp in edit_profiles" ng-if="!edit_profile_entries.length"
-          ng-class="{disabled : grp().usergroup() == 'f'}">
+          ng-class="{disabled : grp.usergroup() == 'f'}">
           <a href 
             style="padding-left: {{pgt_depth(grp) * 10 + 5}}px"
             ng-click="set_profile(grp)">{{grp.name()}}</a>