From 88b474e6e9ee8909508eebfa9c779a83d2bbef62 Mon Sep 17 00:00:00 2001 From: Rolf Schmidt Date: Mon, 24 Apr 2017 11:55:15 +0200 Subject: [PATCH 1/2] Fixed issue #975 - Exception in OTRS Import. --- app/models/user.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 66a53ad8c..cd6aa9deb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -903,6 +903,8 @@ raise 'Minimum one user need to have admin permissions' =end def last_admin_check(role) + return if Setting.get('import_mode') + ticket_admin_role_ids = Role.joins(:permissions).where(permissions: { name: ['admin', 'admin.user'] }).pluck(:id) count = User.joins(:roles).where(roles: { id: ticket_admin_role_ids }, users: { active: true }).count if ticket_admin_role_ids.include?(role.id) From 3d40aa022de647e8f57eb38dff475805e430868c Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Mon, 24 Apr 2017 13:57:19 +0200 Subject: [PATCH 2/2] Fixed issue #906 - Doorkeeper tokens should be refreshable but aren't. --- config/initializers/doorkeeper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 4eeb378e4..a1bc85d76 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -43,7 +43,7 @@ Doorkeeper.configure do # reuse_access_token # Issue access tokens with refresh token (disabled by default) - # use_refresh_token + use_refresh_token # Provide support for an owner to be assigned to each registered application (disabled by default) # Optional parameter confirmation: true (default false) if you want to enforce ownership of