further refinement of tag query for #97

jywarren · Mar 3, 2015 · 5b9c480 · 5b9c480
1 parent 712cd4c
commit 5b9c480
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/controllers/tag_controller.rb b/app/controllers/tag_controller.rb
@@ -36,9 +36,7 @@ def create
   def show
     @tag = Tag.find_by_name(params[:id], :order => "id DESC")
     if @tag
-      @spectrums = @tag.spectra
-      @count = @spectrums.length
-      @spectrums = @spectrums.paginate :page => params[:page], :per_page => 24
+      @spectrums = @tag.spectra.paginate(:page => params[:page], :per_page => 24)
     end
     @spectrums = [] if @spectrums.nil?
     @comments = Comment.all :limit => 12, :order => "id DESC"

diff --git a/app/views/tag/show.html.erb b/app/views/tag/show.html.erb
@@ -40,7 +40,7 @@
     <a rel="tooltip" class="btn btn-small" href="http://publiclab.org/wiki/spectral-workbench-exporting" title="About export formats"><i class="icon icon-question-sign"></i></a> 
   </div>
 
-  <h2 style="margin-left:10px;">Spectra tagged with "<%=h params[:id] %>"<% if @tag %> (<%= @count %>)<% end %></h2>
+  <h2 style="margin-left:10px;">Spectra tagged with "<%=h params[:id] %>"</h2>
 
   <% if @tag %>
   <%= render :partial => 'spectrums/list' %>

diff --git a/test/functional/tag_controller_test.rb b/test/functional/tag_controller_test.rb
@@ -1,8 +1,10 @@
 require 'test_helper'
 
 class TagControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+
+  test "should show tag" do
+    get :show, :id => 'cfl'
+    assert_response :success
   end
+
 end