Permalink
Browse files

[api] fix merge error

  • Loading branch information...
1 parent 3f5b72f commit 6c1feff160d7a3fd9191a0136578cd9628714e81 @adrianschroeter adrianschroeter committed Sep 18, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −3 src/api/app/controllers/request_controller.rb
@@ -834,7 +834,6 @@ def create_create
if action.source.has_attribute? 'package'
spkg = DbPackage.find_by_project_and_name action.source.project, action.source.package
if spkg and not @http_user.can_modify_package? spkg
- review_packages.push({ :by_project => action.source.project, :by_package => action.source.package })
if action.value('type') == 'submit'
if action.has_element? :options
render_error :status => 403, :errorcode => "lacking_maintainership",
@@ -848,15 +847,15 @@ def create_create
end
else
sprj = DbProject.find_by_name action.source.project
- if sprj and not @http_user.can_modify_project? sprj and not sprj.find_attribute("OBS", "ApprovedRequestSource")
+ if sprj and not @http_user.can_modify_project? sprj
if action.value('type') == 'submit'
if action.has_element? :options
render_error :status => 403, :errorcode => "lacking_maintainership",
:message => "Creating a submit request action with options requires maintainership in source package"
return
end
end
- if not sprj.find_attribute("OBS", "ApprovedRequestSource")
+ if not sprj.find_attribute("OBS", "ApprovedRequestSource")
review_packages.push({ :by_project => action.source.project })
end
end

0 comments on commit 6c1feff

Please sign in to comment.