From ea61c4b690c2d76fe15b95f4cb65b073f05ded54 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 22 Oct 2013 15:12:43 +0200 Subject: [PATCH] [api] remove simple models that only model backend routes --- src/api/app/models/fileinfo.rb | 2 ++ src/api/config/initializers/activexml.rb | 2 ++ .../controllers/webui/project_controller.rb | 2 +- .../webui/app/models/webui/downloadcounter.rb | 2 -- src/api/webui/app/models/webui/fileinfo.rb | 2 -- src/api/webui/app/models/webui/jobhislist.rb | 2 -- .../webui/app/models/webui/latest_added.rb | 2 -- .../app/models/webui/most_active_packages.rb | 2 -- .../app/models/webui/most_active_projects.rb | 2 -- .../webui/config/initializers/activexml.rb | 23 ------------------- 10 files changed, 5 insertions(+), 36 deletions(-) create mode 100644 src/api/app/models/fileinfo.rb delete mode 100644 src/api/webui/app/models/webui/downloadcounter.rb delete mode 100644 src/api/webui/app/models/webui/fileinfo.rb delete mode 100644 src/api/webui/app/models/webui/jobhislist.rb delete mode 100644 src/api/webui/app/models/webui/latest_added.rb delete mode 100644 src/api/webui/app/models/webui/most_active_packages.rb delete mode 100644 src/api/webui/app/models/webui/most_active_projects.rb diff --git a/src/api/app/models/fileinfo.rb b/src/api/app/models/fileinfo.rb new file mode 100644 index 00000000000..258cf7d3bd0 --- /dev/null +++ b/src/api/app/models/fileinfo.rb @@ -0,0 +1,2 @@ +class Fileinfo < ActiveXML::Node +end diff --git a/src/api/config/initializers/activexml.rb b/src/api/config/initializers/activexml.rb index 464571b2e88..64c120dfe94 100644 --- a/src/api/config/initializers/activexml.rb +++ b/src/api/config/initializers/activexml.rb @@ -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' diff --git a/src/api/webui/app/controllers/webui/project_controller.rb b/src/api/webui/app/controllers/webui/project_controller.rb index ca185b0212c..5022ced6860 100644 --- a/src/api/webui/app/controllers/webui/project_controller.rb +++ b/src/api/webui/app/controllers/webui/project_controller.rb @@ -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}" diff --git a/src/api/webui/app/models/webui/downloadcounter.rb b/src/api/webui/app/models/webui/downloadcounter.rb deleted file mode 100644 index 22c80b0970e..00000000000 --- a/src/api/webui/app/models/webui/downloadcounter.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Webui::Downloadcounter < Webui::Node -end diff --git a/src/api/webui/app/models/webui/fileinfo.rb b/src/api/webui/app/models/webui/fileinfo.rb deleted file mode 100644 index e7ce17651e7..00000000000 --- a/src/api/webui/app/models/webui/fileinfo.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Webui::Fileinfo < Webui::Node -end diff --git a/src/api/webui/app/models/webui/jobhislist.rb b/src/api/webui/app/models/webui/jobhislist.rb deleted file mode 100644 index a6a7af97a68..00000000000 --- a/src/api/webui/app/models/webui/jobhislist.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Webui::Jobhislist < Webui::Node -end diff --git a/src/api/webui/app/models/webui/latest_added.rb b/src/api/webui/app/models/webui/latest_added.rb deleted file mode 100644 index eaf0984a978..00000000000 --- a/src/api/webui/app/models/webui/latest_added.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Webui::LatestAdded < Webui::Node -end diff --git a/src/api/webui/app/models/webui/most_active_packages.rb b/src/api/webui/app/models/webui/most_active_packages.rb deleted file mode 100644 index 91b3b8ca88f..00000000000 --- a/src/api/webui/app/models/webui/most_active_packages.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Webui::MostActivePackages < Webui::Node -end diff --git a/src/api/webui/app/models/webui/most_active_projects.rb b/src/api/webui/app/models/webui/most_active_projects.rb deleted file mode 100644 index bb7d1e6cf97..00000000000 --- a/src/api/webui/app/models/webui/most_active_projects.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Webui::MostActiveProjects < Webui::Node -end diff --git a/src/api/webui/config/initializers/activexml.rb b/src/api/webui/config/initializers/activexml.rb index 5fe7179b6a7..7989b3db30a 100644 --- a/src/api/webui/config/initializers/activexml.rb +++ b/src/api/webui/config/initializers/activexml.rb @@ -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' @@ -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', @@ -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'