Merge pull request #6447 from adrianschroeter/auto_accept

[api] ensure right user when doing auto_accept in a loop
openSUSE · Dec 4, 2018 · 4584b12 · 4584b12
2 parents c3c787a + fe91d48
commit 4584b12
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/api/app/models/bs_request.rb b/src/api/app/models/bs_request.rb
@@ -969,8 +969,12 @@ def auto_accept
     return if approver && state == :review
 
     with_lock do
-      User.current ||= User.find_by_login(creator) if accept_at
-      User.current = User.find_by_login(approver) if approver
+      if accept_at
+        User.current = User.find_by_login(creator)
+      elsif approver
+        User.current = User.find_by_login(approver)
+      end
+      raise 'Request lacks definition of owner for auto accept' unless User.current
 
       begin
         change_state(newstate: 'accepted', comment: 'Auto accept')