stat cat editor now loads stat cat perms at page load time to define

how the edit widgets will be defined

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index ee5f95c..d7cd0b2 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -779,7 +779,7 @@ sub get_org_unit {
 __PACKAGE__->register_method(
        method  => "get_org_tree",
        api_name        => "open-ils.actor.org_tree.retrieve",
-       argc            => 1, 
+       argc            => 0, 
        note            => "Returns the entire org tree structure",
 );
 
@@ -1027,7 +1027,7 @@ sub check_user_perms {
 
        my @not_allowed;
        for my $perm (@$perm_types) {
-               if($apputils->check_user_perms($user_id, $org_id, $perm)) {
+               if($apputils->check_perms($user_id, $org_id, $perm)) {
                        push @not_allowed, $perm;
                }
        }
@@ -1052,19 +1052,12 @@ __PACKAGE__->register_method(
 sub check_user_perms2 {
        my( $self, $client, $authtoken, $user_id, $orgs, $perms ) = @_;
 
-       my( $staff, $evt ) = $apputils->checkses($authtoken);
+       my( $staff, $target, $evt ) = $apputils->checkses_requestor(
+               $authtoken, $user_id, 'VIEW_PERMISSION' );
        return $evt if $evt;
 
        my @not_allowed;
        for my $org (@$orgs) {
-
-               if($staff->id ne $user_id) {
-                       if( $evt = $apputils->check_perms(
-                               $staff->id, $org, 'VIEW_PERMISSION') ) {
-                               return $evt;
-                       }
-               }
-
                for my $perm (@$perms) {
                        if($apputils->check_perms($user_id, $org, $perm)) {
                                push @not_allowed, [ $org, $perm ];
@@ -1076,6 +1069,44 @@ sub check_user_perms2 {
 }
 
 
+__PACKAGE__->register_method(
+       method => 'check_user_perms3',
+       api_name        => 'open-ils.actor.user.perm.highest_org',
+       notes           => q/
+               Returns the highest org unit object at which a user has a given permission
+               If the requestor does not match the target user, the requestor must have
+               'VIEW_PERMISSION' rights at the home org unit of the target user
+               @param authtoken The login session key
+               @param userid The id of the user in question
+               @param perm The permission to check
+               @return The org unit highest in the org tree within which the user has
+               the requested permission
+       /);
+
+sub check_user_perms3 {
+       my( $self, $client, $authtoken, $userid, $perm ) = @_;
+
+       my( $staff, $target, $org, $evt );
+
+       ( $staff, $target, $evt ) = $apputils->checkses_requestor(
+               $authtoken, $userid, 'VIEW_PERMISSION' );
+       return $evt if $evt;
+
+       my $tree = get_org_tree();
+       $org = $apputils->find_org($tree, $target->home_ou );
+
+       my $lastid = undef;
+       while( $org ) {
+               last if ($apputils->check_perms( $userid, $org->id, $perm )); # perm failed
+               $lastid = $org->id;
+               $org = $apputils->find_org( $tree, $org->parent_ou() );
+       }
+
+       return $lastid;
+}
+
+
+
 
 __PACKAGE__->register_method(
        method  => "user_fines_summary",
@@ -1354,5 +1385,7 @@ sub get_user_perm_groups {
 }      
 
 
+
+
 1;
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
index 5410a56..3c8c6ef 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
@@ -645,4 +645,18 @@ sub fetch_stat_cat_entry {
        return ( $entry, $evt );
 }
 
+
+sub find_org {
+       my( $self, $org_tree, $orgid )  = @_;
+       return $org_tree if ( $org_tree->id eq $orgid );
+       return undef unless ref($org_tree->children);
+       for my $c (@{$org_tree->children}) {
+               my $o = $self->find_org($c, $orgid);
+               return $o if $o;
+       }
+       return undef;
+}
+
+
+
 1;

diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
index d1b878b..2e04895 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
@@ -5,10 +5,6 @@ var SC_DELETE                  = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.delete';
 var SC_ENTRY_CREATE    = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.create';
 var SC_ENTRY_UPDATE    = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.update';
 var SC_ENTRY_DELETE    = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.delete';
-/*
-var SC_MAP_CREATE              = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.WHAT_map.create';
-var SC_MAP_UPDATE              = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.WHAT_map.update';
-*/
 
 var ACTOR                              = 'actor';
 var ASSET                              = 'asset';
@@ -16,22 +12,60 @@ var session                         = null;
 var user                                       = null;
 
 var scCache                            = {};
+var PERMS                              = {};
+PERMS[ACTOR]                   = {};
+PERMS[ASSET]                   = {};
+
 var currentlyVisible;
 var opacVisible                = false;
+var cgi;
 
 
 function scEditorInit() {
-       var cgi = new CGI();
+       cgi = new CGI();
        session = cgi.param('ses');
        if(!session) throw "User session is not defined";
-       var show = cgi.param('show');
        user = fetchUser(session);
-       if(show == ACTOR) scShow(ACTOR);
-       else scShow(ASSET);
+       setTimeout( function() { scFetchPerms(); scGo(); }, 20 );
+}
+
+function scGo() {
+
+
+       var show = cgi.param('show');
+       if(!show) show = ASSET;
+       scShow(show);
        scBuildNew();
        $('sc_user').appendChild(text(user.usrname()));
 }
 
+function scFetchPerms() {
+
+       PERMS[ACTOR].create_stat_cat = scFetchPerm('CREATE_PATRON_STAT_CAT');
+       PERMS[ACTOR].update_stat_cat = scFetchPerm('UPDATE_PATRON_STAT_CAT');
+       PERMS[ACTOR].delete_stat_cat = scFetchPerm('DELETE_PATRON_STAT_CAT');
+       PERMS[ACTOR].create_stat_cat_entry = scFetchPerm('CREATE_PATRON_STAT_CAT_ENTRY');
+       PERMS[ACTOR].update_stat_cat_entry = scFetchPerm('UPDATE_PATRON_STAT_CAT_ENTRY');
+       PERMS[ACTOR].delete_stat_cat_entry = scFetchPerm('DELETE_PATRON_STAT_CAT_ENTRY');
+
+       PERMS[ASSET].create_stat_cat = scFetchPerm('CREATE_COPY_STAT_CAT');
+       PERMS[ASSET].update_stat_cat = scFetchPerm('UPDATE_COPY_STAT_CAT');
+       PERMS[ASSET].delete_stat_cat = scFetchPerm('DELETE_COPY_STAT_CAT');
+       PERMS[ASSET].create_stat_cat_entry = scFetchPerm('CREATE_COPY_STAT_CAT_ENTRY');
+       PERMS[ASSET].update_stat_cat_entry = scFetchPerm('UPDATE_COPY_STAT_CAT_ENTRY');
+       PERMS[ASSET].delete_stat_cat_entry = scFetchPerm('DELETE_COPY_STAT_CAT_ENTRY');
+}
+
+function scFetchPerm(perm) {
+       var req = new RemoteRequest(
+               'open-ils.actor',
+               'open-ils.actor.user.perm.highest_org', session, user.id(), perm );
+       req.send(true);
+       return req.getResultObject();
+       PERMS.create_stat = req.getResultObjecdt();
+}
+
+
 function _cleanTbody(tbody) {
        for( var c  = 0; c < tbody.childNodes.length; c++ ) {
                var child = tbody.childNodes[c];
@@ -75,6 +109,7 @@ function scShow(type) {
 var scRow; var scCounter;
 function scDraw( type, cats ) {
 
+       hideMe($('loading'));
        if(!cats || cats.length == 0) return unHideMe($('sc_none'));
        var tbody = $('sc_tbody');
 
@@ -98,7 +133,6 @@ function scInsertCat( tbody, cat, type ) {
 
        $n(row, 'sc_new_entry').onclick = function() { scNewEntry(type, cat, tbody); }
        $n(row, 'sc_edit').onclick = function(){ scEdit(tbody, type, cat); };
-       /*$n(row, 'sc_delete').onclick = function(){ scDelete(type, cat.id()); };*/
        $n(row, 'sc_owning_lib').appendChild( text( findOrgUnit(cat.owner()).name() ));
 
        if( cat.opac_visible() ) unHideMe($n(row, 'sc_opac_visible'));
@@ -170,27 +204,54 @@ function scNewEntry( type, cat, tbody ) {
                                tbody.removeChild(row); };
        $n(row, 'sc_new_entry_cancel').onclick = function(){tbody.removeChild(row);}
 
+       var c_org = PERMS[type].create_stat_cat_entry;
+       var max_c_depth = (c_org != null) ? findOrgDepth(c_org) : -1;
+       
+       if( max_c_depth == -1 ) {
+               $n(row, 'sc_new_entry_create').disabled = true;
+               $n(row, 'sc_new_entry_lib').disabled = true;
+               return;
+       }
+
        var org = findOrgUnit(cat.owner());
-       var myorg = findOrgUnit(user.home_ou());
        var depth = findOrgDepth(org);
-       var mydepth = findOrgDepth(myorg);
 
-       if( depth < mydepth ) {
-               depth = mydepth;
-               org = myorg;
+       if( depth < max_c_depth ) {
+               depth = max_c_depth;
+               org = findOrgUnit(c_org);
        }
-
-
-       _scBuildOrgSelector( $n(row, 'sc_new_entry_lib'), org, findOrgDepth(org));
+       
+       _scBuildOrgSelector( $n(row, 'sc_new_entry_lib'), org, depth );
        $n(row, 'sc_new_entry_name').focus();
 }
 
 
 function scBuildNew() {
+
+       var c_org = PERMS[ASSET].create_stat_cat;
+       var max_c_depth = (c_org != null) ? findOrgDepth(c_org) : -1;
+
+       var ac_org = PERMS[ACTOR].create_stat_cat;
+       var max_ac_depth = (ac_org != null) ? findOrgDepth(ac_org) : -1;
+
+       var depth = max_c_depth;
+       var org = c_org;
+
        var selector = $('sc_owning_lib_selector');
-       var org = findOrgUnit( user.home_ou() );
-       var offset = findOrgDepth(org);
-       _scBuildOrgSelector( selector, org, offset);
+
+       if( depth == -1 ) {
+               depth = max_ac_depth;
+               org = ac_org;
+               if( depth == -1 ) {
+                       $('sc_new').disabled = true;
+                       $('sc_type_selector').disabled = true;
+                       selector.disabled = true;
+                       return;
+               }
+       }
+
+       org = findOrgUnit( org );
+       _scBuildOrgSelector( selector, org, depth );
 }
 
 function _scBuildOrgSelector(selector, org, offset) {
@@ -233,7 +294,7 @@ function scEdit( tbody, type, cat ) {
        row.setAttribute('edit', '1');
 
        var r = $('sc_tr_' + cat.id());
-       if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
+       if(r.nextSibling) { tbody.insertBefore( row, r.nextSibling ); }
        else{ tbody.appendChild(row); }
 
        $n(row, 'sc_edit_name').value = cat.name();
@@ -268,20 +329,23 @@ function scEdit( tbody, type, cat ) {
                        'sc_edit_opac_visibility').checked = true;
 
        $n(row, 'sc_edit_submit').onclick = 
-               function() { 
-                       if( scEditGo( type, cat, row, selector ) ) 
-                               tbody.removeChild(row); };
+               function() { scEditGo( type, cat, row, selector ); };
 
-       $n(row, 'sc_edit_delete').onclick = function(){ scDelete(type, cat.id()); };
+       $n(row, 'sc_edit_delete').onclick = 
+               function(){ scDelete(type, cat.id()); };
 
        var o_depth = findOrgDepth(findOrgUnit(cat.owner()));
-       var m_depth = findOrgDepth(findOrgUnit(user.home_ou()));
+       /*var m_depth = findOrgDepth(findOrgUnit(user.home_ou()));*/
+       var e_org = PERMS[type].update_stat_cat;
+       var d_org = PERMS[type].delete_stat_cat;
+       var max_e_depth = (e_org != null) ? findOrgDepth(e_org) : -1;
+       var max_d_depth = (d_org != null) ? findOrgDepth(d_org) : -1;
 
-       if(  o_depth < m_depth ) {
+       if( max_e_depth == -1 || o_depth < max_e_depth )
                $n(row,'sc_edit_submit').disabled = true;
-               $n(row,'sc_edit_delete').disabled = true;
-       }
 
+       if( max_d_depth == -1 || o_depth < max_d_depth )
+               $n(row,'sc_edit_delete').disabled = true;
 }
 
 function scEditGo( type, cat, row, selector ) {
@@ -342,13 +406,18 @@ function scUpdateEntry( cat, entry, tbody, type ) {
                function(){ scEntryDelete( cat, entry, type ); }
 
        var o_depth = findOrgDepth( findOrgUnit(entry.owner()) );
-       var m_depth = findOrgDepth(findOrgUnit(user.home_ou()));
+       /*var m_depth = findOrgDepth(findOrgUnit(user.home_ou()));*/
+
+       var e_org = PERMS[type].update_stat_cat_entry;
+       var d_org = PERMS[type].delete_stat_cat_entry;
+       var max_e_depth = (e_org != null) ? findOrgDepth(e_org) : -1;
+       var max_d_depth = (d_org != null) ? findOrgDepth(d_org) : -1;
 
-       if(  o_depth < m_depth ) {
+       if( max_e_depth == -1 || o_depth < max_e_depth )
                $n(row,'sc_edit_entry_name_submit').disabled = true;
+
+       if( max_d_depth == -1 || o_depth < max_d_depth )
                $n(row,'sc_edit_entry_delete').disabled = true;
-       }
-               
 }
 
 function scEntryDelete( cat, entry, type ) {

diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xml
index 251a0a6..99be66d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xml
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xml
@@ -37,6 +37,7 @@
 
        <body onload='try{scEditorInit();}catch(e){alert(js2JSON(e));}'>
 
+
                <div style='position:absolute; top: 5px; right: 5px;'>
                        <span>Welcome </span><b><span id='sc_user'/></b>
                </div>
@@ -87,7 +88,7 @@
                                        </tr>
                                        <tr>
                                                <td colspan='4'>
-                                                       <input type='submit' value='Create new stat cat' onclick='scNew();'/>
+                                                       <input type='submit' value='Create new stat cat' onclick='scNew();' id='sc_new'/>
                                                </td>
                                        </tr>
                                </tbody>
@@ -97,6 +98,8 @@
                        <hr/>
                        <br/>
 
+                       <div id='loading' class='has_color'><h2>Loading permissions and stat cats...</h2></div>
+
                        <table width='98%'>
                                <tbody>
                                        <tr>