templates api - route for listing templates in an environment

cli/src/katello/client/api/template.py

@@ -18,8 +18,8 @@
 class TemplateAPI(KatelloAPI):
 
     def templates(self, envId):
-        path = "/api/templates/"
-        tpls = self.server.GET(path, {"environment_id": envId})[1]
+        path = "/api//environmants/%s/templates/" % str(envId)
+        tpls = self.server.GET(path)[1]
         return tpls
 
 

src/app/controllers/api/templates_controller.rb

@@ -15,14 +15,19 @@
 class Api::TemplatesController < Api::ApiController
 
   before_filter :find_environment, :only => [:create, :import]
+  before_filter :try_find_environment, :only => [:index]
   before_filter :find_template, :only => [:show, :update, :update_content, :destroy, :promote, :export]
 
   # TODO: define authorization rules
   skip_before_filter :authorize
 
   def index
-    templates = SystemTemplate.where(query_params)
-    render :json => templates.to_json
+    if @environment.nil?
+      tpls = SystemTemplate.all
+    else
+      tpls = @environment.system_templates
+    end
+    render :json => tpls.to_json
   end
 
   def show
@@ -158,6 +163,10 @@ def find_environment
     @environment
   end
 
+  def try_find_environment
+    find_environment if not params[:environment_id].nil?
+  end
+
   def find_template
     @template = SystemTemplate.find(params[:id])
     raise HttpErrors::NotFound, _("Couldn't find template '#{params[:id]}'") if @template.nil?

src/config/routes.rb

@@ -319,6 +319,7 @@ def matches?(request)
         get :repositories, :on => :member
       end
       resources :activation_keys, :only => [:index, :create]
+      resources :templates, :only => [:index]
     end
 
     resources :activation_keys, :only => [:show, :update, :destroy]

src/spec/controllers/api/templates_controller_spec.rb

@@ -48,17 +48,28 @@
 
   describe "index" do
 
-    it 'should get a list of templates from specified environment ID' do
-      SystemTemplate.should_receive(:where).with("environment_id" => @locker.id).and_return([@tpl])
+    before :each do
+      @environment2 = KTEnvironment.new(:name => 'environment2')
+      @environment2.id = 3
+
+      KTEnvironment.stub(:find).with(@locker.id).and_return(@locker)
+      KTEnvironment.stub(:find).with(@environment2.id).and_return(@environment2)
+    end
+
+    it 'should get a list of templates from specified environment' do
+      @locker.should_receive(:system_templates).and_return([@tpl])
       get 'index', :environment_id => @locker.id
       response.should be_success
     end
 
-    it 'should not fail if no templates are found, but return an empty list' do
-      @environment2 = KTEnvironment.new(:name => 'environment2')
-      @environment2.id = 3
+    it 'should get a list of all templates' do
+      SystemTemplate.should_receive(:all).and_return([@tpl])
+      get 'index'
+      response.should be_success
+    end
 
-      SystemTemplate.should_receive(:where).with("environment_id" => @environment2.id).and_return([])
+    it 'should not fail if no templates are found, but return an empty list' do
+      @environment2.should_receive(:system_templates).and_return([])
       get 'index', :environment_id => @environment2.id
       response.should be_success
     end