tags page

miros · Sep 30, 2010 · 0e272fc · 0e272fc
1 parent c5289cf
commit 0e272fc
Show file tree

Hide file tree

Showing 10 changed files with 184 additions and 83 deletions.
diff --git a/.idea/answers.iml b/.idea/answers.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,7 @@ gem 'flutie'
 gem 'nifty-generators'
 gem 'rutils'
 gem 'maruku'
+gem "will_paginate", "~> 3.0.pre2"
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -32,15 +32,15 @@ GEM
       activesupport (~> 3.0.0)
     bcrypt-ruby (2.1.2)
     builder (2.1.2)
-    devise (1.1.2)
+    devise (1.1.3)
       bcrypt-ruby (~> 2.1.2)
       warden (~> 0.10.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     flutie (1.0.4)
     gilenson (1.1.1)
-    haml (3.0.18)
+    haml (3.0.21)
     i18n (0.4.1)
     mail (2.2.6.1)
       activesupport (>= 2.3.6)
@@ -49,13 +49,13 @@ GEM
     maruku (0.6.0)
       syntax (>= 1.0.0)
     mime-types (1.16)
-    nifty-generators (0.4.0)
+    nifty-generators (0.4.1)
     pg (0.9.0)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
     rails (3.0.0)
       actionmailer (= 3.0.0)
@@ -86,12 +86,13 @@ GEM
     rutils (1.1.1)
       gilenson
     syntax (1.0.0)
-    thor (0.14.0)
+    thor (0.14.2)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
     warden (0.10.7)
       rack (>= 1.0.0)
+    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
@@ -107,3 +108,4 @@ DEPENDENCIES
   rspec (>= 2.0.0.beta.22)
   rspec-rails (>= 2.0.0.beta.22)
   rutils
+  will_paginate (~> 3.0.pre2)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -2,7 +2,7 @@ class HomeController < ApplicationController
 
   def index
 
-    @questions = Question.limit(20)
+    @questions = Question.paginate :page => params[:page]
 
   end
 

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -0,0 +1,10 @@
+class TagsController < ApplicationController
+
+  def show
+
+    @tag = Tag.find(params[:id])
+    @questions = @tag.questions.paginate :page => params[:page]
+
+  end
+
+end
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -1,5 +1,10 @@
 class Question < Post
 
+  cattr_reader :per_page
+  @@per_page = 3
+
+  default_scope order('created_at DESC')
+
   include Sluggable
 
   use_as_slug :title

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
@@ -2,5 +2,12 @@
 #questions_list
   = render :partial => "question", :collection => @questions
 
+%pages
+  = will_paginate @questions 
+
+%br
+%br
+
 %p
   =link_to 'Задать вопрос', new_question_path
+
diff --git a/app/views/tags/_tag.html.haml b/app/views/tags/_tag.html.haml
@@ -1 +1 @@
-%a.post_tag= tag.name
+= link_to tag.name, tag, :class => :post_tag
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
@@ -0,0 +1,5 @@
+#questions_list
+  = render :partial => "/home/question", :collection => @questions
+
+%pages
+  = will_paginate @questions