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

[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  a0d989091da997d6c571c9ed611f3784df54107d (commit)
       via  8af976733e7d0d814c06804c48e4cd38cbe6e8dd (commit)
      from  b5b56e075c1cbb38da55ccfcf3a3d4f93c401c11 (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 a0d989091da997d6c571c9ed611f3784df54107d
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Wed Apr 22 09:54:11 2015 -0400

    LP#1446860 - Correct mistaken logic in previous fix.
    
    See https://bugs.launchpad.net/evergreen/+bug/1446860/comments/2
    for reference.  The logic was not enforcing the "if the editing
    staff member doesn't have permission to edit a user in this
    permission group" check.  This corrects that.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index e5846fc..2e6f2ad 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -302,7 +302,7 @@ function load() {
 
 	dojo.connect(setExpireDate, 'onClick', setExpireDateHandler);
 
-    if(!patron.isnew() && !checkGrpAppPerm(patron.profile()) && patron.id() == openils.User.user.id()) {
+    if(!patron.isnew() && !checkGrpAppPerm(patron.profile()) || patron.id() == openils.User.user.id()) {
         // we are not allowed to edit this user, so disable the save option
         saveButton.attr('disabled', true);
         saveCloneButton.attr('disabled', true);

commit 8af976733e7d0d814c06804c48e4cd38cbe6e8dd
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Tue Apr 21 17:10:49 2015 -0400

    LP#1446860 Staff were able to edit their own accounts.
    
    This change reverses what appears to be a thinko in the
    original programming.  If the editing user is the same
    as the user being edited, disable the Save button.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index ced646f..e5846fc 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -302,7 +302,7 @@ function load() {
 
 	dojo.connect(setExpireDate, 'onClick', setExpireDateHandler);
 
-    if(!patron.isnew() && !checkGrpAppPerm(patron.profile()) && patron.id() != openils.User.user.id()) {
+    if(!patron.isnew() && !checkGrpAppPerm(patron.profile()) && patron.id() == openils.User.user.id()) {
         // we are not allowed to edit this user, so disable the save option
         saveButton.attr('disabled', true);
         saveCloneButton.attr('disabled', true);

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

Summary of changes:
 Open-ILS/web/js/ui/default/actor/user/register.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS