# HG changeset patch # User Marcin Kuzminski # Date 2017-07-24 09:51:07 # Node ID fcc350c91d686d76a08965052bad1d2881a22a40 # Parent 8e51a9362928c639d33be3b19b834bee7c20e217 users: made the function for account deactivation easier to use inside ishell. diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -870,7 +870,7 @@ class UserModel(BaseModel): return list_of_accounts - def deactivate_last_users(self, expected_users): + def deactivate_last_users(self, expected_users, current_user=None): """ Deactivate accounts that are over the license limits. Algorithm of which accounts to disabled is based on the formula: @@ -885,7 +885,8 @@ class UserModel(BaseModel): the end N ammoun of users from that list """ - list_of_accounts = self.get_accounts_in_creation_order() + list_of_accounts = self.get_accounts_in_creation_order( + current_user=current_user) for acc_id in list_of_accounts[expected_users + 1:]: user = User.get(acc_id)