[webui] remove first webui/ controller in the API

It's just one AR call now
openSUSE · Oct 22, 2013 · 1c50011 · 1c50011
1 parent 690ab15
commit 1c50011
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/src/api/app/controllers/webui/attrib_types_controller.rb b/src/api/app/controllers/webui/attrib_types_controller.rb
diff --git a/src/api/config/routes.rb b/src/api/config/routes.rb
@@ -369,7 +369,6 @@
       end
       resources :owners, :only => [:index]
       resources :searches, :only => [:new, :create]
-      resources :attrib_types, :only => [:index]
 
       # comments
       get 'comments/request/:id/' => 'comments#requests', constraints: cons

diff --git a/src/api/webui/app/controllers/webui/search_controller.rb b/src/api/webui/app/controllers/webui/search_controller.rb
@@ -182,9 +182,8 @@ def set_parameters
   end
 
   def set_attribute_list
-    # FIXME: needs caching?
-    @attrib_type_list = Webui::ApiDetails.read(:attrib_types).map do |t|
-      ["#{t['attrib_namespace_name']}:#{t['name']}", t['id']]
+    @attrib_type_list = AttribType.includes(:attrib_namespace).map do |t|
+      ["#{t.attrib_namespace.name}:#{t.name}", t['id']]
     end
     @attrib_type_list.sort_by! {|a| a.first }
     @attrib_type_list.unshift(['', ''])

diff --git a/src/api/webui/app/models/webui/api_details.rb b/src/api/webui/app/models/webui/api_details.rb
@@ -79,8 +79,6 @@ def self.http_do(verb, route_name, *args)
       when :ids_requests then "requests/ids"
       when :by_class_requests then "requests/by_class"
 
-      when :attrib_types then "attrib_types"
-
       when :searches then "searches"
 
       when :comments_by_package then "comments/package/#{ids.first}/#{ids.last}"