Skip to content

Commit

Permalink
[webui] remove the usage of find_cached
Browse files Browse the repository at this point in the history
  • Loading branch information
coolo committed Oct 18, 2013
1 parent c38193e commit 23d1512
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions src/api/webui/app/controllers/webui/request_controller.rb
Expand Up @@ -105,7 +105,7 @@ def sourcediff

def changerequest
required_parameters :id
@req = find_cached(BsRequest, params[:id] )
@req = Webui::BsRequest.find params[:id]
unless @req
flash[:error] = "Can't find request #{params[:id]}"
redirect_back_or_to :controller => 'home', :action => 'requests' and return
Expand All @@ -127,9 +127,9 @@ def changerequest
else
tprj, tpkg = params[:add_submitter_as_maintainer_0].split('_#_') # split into project and package
if tpkg
target = find_cached(Package, tpkg, :project => tprj)
target = Package.find(tpkg, :project => tprj)
else
target = find_cached(WebuiProject, tprj)
target = WebuiProject.find(tprj)
end
target.add_person(:userid => @req.creator, :role => "maintainer")
target.save
Expand Down Expand Up @@ -261,8 +261,8 @@ def set_bugowner_request

def change_devel_request_dialog
required_parameters :package, :project
@project = find_cached(WebuiProject, params[:project])
@package = find_cached(Package, params[:package], :project => params[:project])
@project = WebuiProject.find params[:project]
@package = Package.find(params[:package], :project => params[:project])
if @package.has_element?(:devel)
@current_devel_package = @package.devel.value('package') || @package.value('name')
@current_devel_project = @package.devel.value('project')
Expand Down
10 changes: 5 additions & 5 deletions src/api/webui/app/models/webui/person.rb
Expand Up @@ -133,18 +133,18 @@ def involved_projects
groups.each {|group| predicate += " or group/@groupid='#{group}'"}
predicate += ") and @kind!='maintenance_incident'"
logger.debug "Searching for involved projects of #{login} with #{predicate}"
Webui::Collection.find_cached(:what => 'project', :predicate => predicate)
Webui::Collection.find(:what => 'project', :predicate => predicate)
end

def involved_packages
predicate = "person/@userid='#{login}'"
groups.each {|group| predicate += " or group/@groupid='#{group}'"}
Webui::Collection.find_cached(:id, :what => 'package', :predicate => predicate)
Webui::Collection.find(:id, :what => 'package', :predicate => predicate)
end

def running_patchinfos
array = Array.new
col = Webui::Collection.find_cached(:id, :what => 'package', :predicate => "[kind='patchinfo' and issue/[@state='OPEN' and owner/@login='#{CGI.escape(login)}']]")
col = Webui::Collection.find(:id, :what => 'package', :predicate => "[kind='patchinfo' and issue/[@state='OPEN' and owner/@login='#{CGI.escape(login)}']]")
col.each_package do |pi|
hash = { :package => { :project => pi.project, :name => pi.name } }
issues = Array.new
Expand Down Expand Up @@ -216,12 +216,12 @@ def is_maintainer?(project, package = nil)

def has_role?(role, project, package = nil)
if package
package = Webui::Package.find_cached(:project => project, :package => package) if package.class == String
package = Webui::Package.find(:project => project, :package => package) if package.class == String
if package && package.user_has_role?(self, role)
return true
end
end
project = WebuiProject.find_cached(project) if project.class == String
project = WebuiProject.find(project) if project.class == String
if project
return project.user_has_role?(self, role)
else
Expand Down

0 comments on commit 23d1512

Please sign in to comment.