lp1839341 Port Org Setting Editor UI

[evergreen-equinox.git] / Open-ILS / src / perlmods / lib / OpenILS / Application / AppUtils.pm

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
index 566342b..3c32377 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
@@ -1318,19 +1318,63 @@ sub ou_ancestor_setting {
         my $coust = $e->retrieve_config_org_unit_setting_type([
             $name, {flesh => 1, flesh_fields => {coust => ['view_perm']}}
         ]);
-        if ($coust && $coust->view_perm) {
-            # And you can't have permission if you don't have a valid session.
-            return undef if not $e->checkauth;
-            # And now that we know you MIGHT have permission, we check it.
-            return undef if not $e->allowed($coust->view_perm->code, $orgid);
-        }
+        return undef unless ou_ancestor_setting_perm_check($orgid, $coust, $auth)
     }
 
     my $query = {from => ['actor.org_unit_ancestor_setting', $name, $orgid]};
     my $setting = $e->json_query($query)->[0];
     return undef unless $setting;
     return {org => $setting->{org_unit}, value => OpenSRF::Utils::JSON->JSON2perl($setting->{value})};
-}   
+}
+
+# Returns the org id if the requestor has the permissions required
+# to view the ou setting.
+sub ou_ancestor_setting_perm_check {
+    my( $self, $orgid, $view_perm, $e, $auth ) = @_;
+    $e = $e || OpenILS::Utils::CStoreEditor->new(
+        (defined $auth) ? (authtoken => $auth) : ()
+    );
+
+    # And you can't have permission if you don't have a valid session.
+    return undef if not $e->checkauth;
+    # And now that we know you MIGHT have permission, we check it.
+    if ($view_perm) {
+        return undef unless $e->allowed($view_perm, $orgid);
+    }
+
+    return $orgid;
+}
+
+sub ou_ancestor_setting_log {
+    my ( $self, $orgid, $name, $e, $auth ) = @_;
+    $e = $e || OpenILS::Utils::CStoreEditor->new(
+        (defined $auth) ? (authtoken => $auth, xact => 1) : ()
+    );
+    my $coust;
+
+    if ($auth) {
+        $coust = $e->retrieve_config_org_unit_setting_type([
+            $name, {flesh => 1, flesh_fields => {coust => ['view_perm']}}
+        ]);
+        my $orgs = $self->get_org_ancestors($orgid);
+
+        my $qorg = $self->ou_ancestor_setting_perm_check(
+            $orgs,
+            $coust,
+            $e,
+            $auth
+        );
+        my $sort = { order_by => { coustl => 'date_applied DESC' } };
+        return $e->json_query({
+            from => 'coustl',
+            where => {
+                field_name => $name,
+                org => $qorg
+            },
+            $sort
+        });
+    };
+}
 
 # This fetches a set of OU settings in one fell swoop,
 # which can be significantly faster than invoking