Merge pull request #8742 from coolo/fix_8738

Stage all requests, but only link submit requests
openSUSE · Nov 20, 2019 · 44bf6c4 · 44bf6c4
2 parents 178f7b2 + 8a39132
commit 44bf6c4
Show file tree

Hide file tree

Showing 25 changed files with 10,332 additions and 17 deletions.
diff --git a/src/api/app/models/staging/staged_requests.rb b/src/api/app/models/staging/staged_requests.rb
@@ -11,10 +11,18 @@ def create
         link_package(bs_request_action)
       end
       # TODO: implement delete requests
+      ProjectLogEntry.create!(
+        project: staging_project,
+        user_name: user_login,
+        bs_request: request,
+        event_type: :staged_request,
+        datetime: Time.now,
+        package_name: bs_request_action.target_package
+      )
+      staging_project.staged_requests << request
+      add_review_for_staged_request(request)
     end
 
-    result.each { |request| add_review_for_staged_request(request) }
-
     self
   end
 
@@ -64,10 +72,6 @@ def valid?
 
   private
 
-  def result
-    @result ||= []
-  end
-
   def not_removed_packages
     @not_removed_packages ||= {}
   end
@@ -129,17 +133,6 @@ def link_package(bs_request_action)
     create_link(staging_project.name, link_package.name, User.session!, project: source_package.project.name,
                                                                         package: source_package.name, rev: package_rev,
                                                                         vrev: source_vrev)
-
-    ProjectLogEntry.create!(
-      project: staging_project,
-      user_name: user_login,
-      bs_request: request,
-      event_type: :staged_request,
-      datetime: Time.now,
-      package_name: bs_request_action.target_package
-    )
-    staging_project.staged_requests << request
-    result << request
   end
 
   def add_review_for_staged_request(request)