Skip to content

Commit

Permalink
[api] remove simple models that only model backend routes
Browse files Browse the repository at this point in the history
  • Loading branch information
coolo committed Oct 22, 2013
1 parent 0339c25 commit ea61c4b
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 36 deletions.
2 changes: 2 additions & 0 deletions src/api/app/models/fileinfo.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class Fileinfo < ActiveXML::Node
end
2 changes: 2 additions & 0 deletions src/api/config/initializers/activexml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
id: "rest:///search/:what/id?:match",
package: "rest:///search/package?:match",
project: "rest:///search/project?:match"

map.connect :fileinfo, 'rest:///build/:project/:repository/:arch/:package/:filename?:view'
2 changes: 1 addition & 1 deletion src/api/webui/app/controllers/webui/project_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ def rebuild_time
return
end
bdep = BuilddepInfo.find(:project => @project.name, :repository => @repository, :arch => @arch)
jobs = Jobhislist.find(:project => @project.name, :repository => @repository, :arch => @arch,
jobs = Jobhistory.find(:project => @project.name, :repository => @repository, :arch => @arch,
:limit => @packages.size * 3, :code => ['succeeded', 'unchanged'])
unless bdep and jobs
flash[:error] = "Could not collect infos about repository #{@repository}/#{@arch}"
Expand Down
2 changes: 0 additions & 2 deletions src/api/webui/app/models/webui/downloadcounter.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/webui/app/models/webui/fileinfo.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/webui/app/models/webui/jobhislist.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/webui/app/models/webui/latest_added.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/webui/app/models/webui/most_active_packages.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/webui/app/models/webui/most_active_projects.rb

This file was deleted.

23 changes: 0 additions & 23 deletions src/api/webui/config/initializers/activexml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ def add(d)
:all => 'rest:///source/:project',
:issues => 'rest:///source/:project/:name?view=issues'

map.connect :tagcloud, 'rest:///tag/tagcloud?limit=:limit',
:alltags => 'rest:///tag/tagcloud?limit=:limit',
:mytags => 'rest:///user/:user/tags/_tagcloud?limit=:limit',
:hierarchical_browsing => 'rest:///tag/tagcloud?limit=:limit'

map.connect :tag, 'rest:///user/:user/tags/:project/:package',
:tags_by_object => 'rest:///source/:project/:package/_tags'

map.connect :webuigroup, 'rest:///group/:title',
:all => 'rest:///group/'
map.connect :owner, 'rest:///search/owner?:binary&:devel&:limit&:project&:attribute'
Expand All @@ -62,14 +54,11 @@ def add(d)
map.connect :service, 'rest:///source/:project/:package/_service',
:all => 'rest:///service'
map.connect :file, 'rest:///source/:project/:package/:filename?:expand&:rev'
map.connect :jobhislist, 'rest:///build/:project/:repository/:arch/_jobhistory?:limit&:code'

map.connect :buildresult, 'rest:///build/:project/_result?:view&:package&:code&:lastbuild&:arch&:repository'
map.connect :fileinfo, 'rest:///build/:project/:repository/:arch/:package/:filename?:view'
map.connect :statistic, 'rest:///build/:project/:repository/:arch/:package/_statistics'

map.connect :result, 'rest:///result/:project/:platform/:package/:arch/result'
map.connect :packstatus, 'rest:///result/:project/packstatus?:command'

map.connect :collection, 'rest:///search/:what?match=:predicate',
:id => 'rest:///search/:what/id?match=:predicate',
Expand All @@ -91,18 +80,6 @@ def add(d)
map.connect :patchinfo, 'rest:///source/:project/:package/_patchinfo',
:issues => 'rest:///source/:project/:package/?view=issues'

# Statistics
map.connect :latestadded, 'rest:///statistics/latest_added?:limit',
:specific => 'rest:///statistics/added_timestamp/:project/:package'
map.connect :downloadcounter, 'rest:///statistics/download_counter' +
'?:project&:package&:arch&:repo&:group_by&:limit'
map.connect :rating, 'rest:///statistics/rating/:project/:package',
:all => 'rest:///statistics/highest_rated?:limit'
map.connect :mostactiveprojects, 'rest:///statistics/most_active_projects?:limit',
:specific => 'rest:///statistics/activity/:project'
map.connect :mostactivepackages, 'rest:///statistics/most_active_packages?:limit',
:specific => 'rest:///statistics/activity/:project/:package'

map.connect :distribution, 'rest:///distributions/', all: 'rest:///distributions/include_remotes'

map.connect :builddepinfo, 'rest:///build/:project/:repository/:arch/_builddepinfo?:package&:limit&:code'
Expand Down

0 comments on commit ea61c4b

Please sign in to comment.