forked from shaba/openuds
Merge remote-tracking branch 'origin/v2.2'
This commit is contained in:
commit
ac0eefc683
@ -181,7 +181,7 @@ class AssignedService(DetailHandler):
|
||||
logStr = 'Changing ownership of service from {} to {} by {}'.format(service.user.pretty_name, user.pretty_name, self._user.pretty_name)
|
||||
|
||||
# If there is another service that has this same owner, raise an exception
|
||||
if parent.userServices.filter(user=user).exclude(uuid=service.uuid).count() > 0:
|
||||
if parent.userServices.filter(user=user).exclude(uuid=service.uuid).exclude(state__in=State.INFO_STATES).count() > 0:
|
||||
raise self.invalidResponseException('There is already another user service assigned to {}'.format(user.pretty_name))
|
||||
|
||||
service.user = user
|
||||
|
@ -438,6 +438,8 @@ gui.servicesPools.link = (event) ->
|
||||
|
||||
onEdit: (item, event, table, refreshFnc) ->
|
||||
gui.doLog(item)
|
||||
if item.state in ['E', 'R', 'C']
|
||||
return
|
||||
api.templates.get "pool_edit_assigned", (tmpl) ->
|
||||
api.authenticators.overview (data) ->
|
||||
# Sorts groups, expression means that "if a > b returns 1, if b > a returns -1, else returns 0"
|
||||
|
Loading…
Reference in New Issue
Block a user