diff --git a/passhportd/app/views_mod/targetgroup/targetgroup.py b/passhportd/app/views_mod/targetgroup/targetgroup.py index 83cfb617..b478a8b2 100755 --- a/passhportd/app/views_mod/targetgroup/targetgroup.py +++ b/passhportd/app/views_mod/targetgroup/targetgroup.py @@ -286,8 +286,10 @@ def targetgroup_rmuser(): return utils.response('ERROR: "' + targetgroupname + '" -> ' + \ e.message, 409) - utils.notif("User " + username + " has been removed from " + targetgroupname + ".", - "[PaSSHport] " + username + " removed from " + targetgroupname ) + utils.notif("User " + username + " has been removed from " + \ + targetgroupname + ".", + "[PaSSHport] " + username + " removed from " + \ + targetgroupname ) return utils.response('OK: "' + username + '" removed from "' + \ targetgroupname + '"', 200) @@ -327,8 +329,10 @@ def targetgroup_addtarget(): return utils.response('ERROR: "' + targetgroupname + '" -> ' + \ e.message, 409) - utils.notif("Users from " + targetgroupname+ " can now access to " + targetname + ".", - "[PaSSHport] " + targetname + " access granted to " + targetgroupname ) + utils.notif("Users from " + targetgroupname+ " can now access to " + \ + targetname + ".", + "[PaSSHport] " + targetname + " access granted to " + \ + targetgroupname ) return utils.response('OK: "' + targetname + '" added to "' + \ targetgroupname + '"', 200) @@ -375,7 +379,7 @@ def targetgroup_rmtarget(): e.message, 409) utils.notif("Users from " + targetgroupname+ " can not access to " + \ - targetname + "anymore.", + targetname + " via this targetgroup anymore.", "[PaSSHport] " + targetname + " removed from " + \ targetgroupname ) return utils.response('OK: "' + targetname + '" removed from "' + \ diff --git a/passhportd/app/views_mod/usergroup/usergroup.py b/passhportd/app/views_mod/usergroup/usergroup.py index d64cb5cc..71ee7f97 100755 --- a/passhportd/app/views_mod/usergroup/usergroup.py +++ b/passhportd/app/views_mod/usergroup/usergroup.py @@ -254,9 +254,8 @@ def usergroup_adduser(): return utils.response('ERROR: "' + usergroupname + '" -> ' + \ e.message, 409) - utils.notif(username + " added to " + usergroupname + ".\n" + \ - "He can now access to: \n" + usergroupname.accessible_target_list(), - "[PaSSHport] " + username + " added to " + usergroupname) + utils.notif(username + " added to usergroup " + usergroupname + ".\n" , + "[PaSSHport] " + username + " added to usergroup " + usergroupname) return utils.response('OK: "' + username + '" added to "' + \ usergroupname + '"', 200) @@ -302,8 +301,8 @@ def usergroup_rmuser(): return utils.response('ERROR: "' + usergroupname + '" -> ' + \ e.message, 409) - utils.notif(username + " removed from " + usergroupname + ".", - "[PaSSHport] " + username + " removed from " + usergroupname) + utils.notif(username + " removed from usergroup " + usergroupname + ".", + "[PaSSHport] " + username + " removed from usergroup " + usergroupname) return utils.response('OK: "' + username + '" removed from "' + \ usergroupname + '"', 200) @@ -343,7 +342,7 @@ def usergroup_addmanager(): return utils.response('ERROR: "' + usergroupname + '" -> ' + \ e.message, 409) - utils.notif(username + " is now manager of " + usergroupam2Ye + ".", + utils.notif(username + " is now manager of " + usergroupname + ".", "[PaSSHport] " + username + " promoted manager of " + usergroupname) return utils.response('OK: "' + username + '" is manager of "' + \ usergroupname + '"', 200) @@ -390,6 +389,8 @@ def usergroup_rmmanager(): return utils.response('ERROR: "' + usergroupname + '" -> ' + \ e.message, 409) + utils.notif(username + " is no more manager of " + usergroupname + ".", + "[PaSSHport] " + username + " manager rights removed of " + usergroupname) return utils.response('OK: "' + username + \ '" is not anymore manager of "' + \ usergroupname + '"', 200) @@ -444,6 +445,10 @@ def usergroup_addusergroup(): return utils.response('ERROR: "' + usergroupname + '" -> ' + \ e.message, 409) + utils.notif(subusergroupname + " added to usergroup " + \ + usergroupname + ".", + "[PaSSHport] " + subusergroupname + " added to usergroup " + \ + usergroupname) return utils.response('OK: "' + subusergroupname + '" added to "' + \ usergroupname + '"', 200) @@ -489,5 +494,9 @@ def usergroup_rmusergroup(): return utils.response('ERROR: "' + usergroupname + '" -> ' + \ e.message, 409) + utils.notif(subusergroupname + " removed from usergroup " + \ + usergroupname + ".", + "[PaSSHport] " + subusergroupname + " removed from usergroup " + \ + usergroupname) return utils.response('OK: "' + subusergroupname + '" removed from "' + \ usergroupname + '"', 200)