Fix padding

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 777034468de2db9db4944461656554b2f0455b5a..e900733e44a71691c8b5f3dff8c90af053a22b51 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -9,11 +9,6 @@ class DiaryEntryController < ApplicationController
   before_filter :check_database_writable, :only => [:new, :edit]
   before_filter :require_administrator, :only => [:hide, :hidecomment]
 
   before_filter :check_database_writable, :only => [:new, :edit]
   before_filter :require_administrator, :only => [:hide, :hidecomment]
 

-#  caches_action :list, :layout => false, :unless => :user_specific_list?
-  caches_action :rss, :layout => true
-#  caches_action :view, :layout => false
-  cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment]
-

   def new
     @title = t 'diary_entry.new.title'
 
   def new
     @title = t 'diary_entry.new.title'
 


@@ -80,36 +75,15 @@ class DiaryEntryController < ApplicationController
 
       if @this_user
         @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
 
       if @this_user
         @title = t 'diary_entry.list.user_title', :user => @this_user.display_name

-        @entry_pages, @entries = paginate(:diary_entries,
-                                          :conditions => {
-                                            :user_id => @this_user.id,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = @this_user.diary_entries

       else
         render_unknown_user params[:display_name]
       else
         render_unknown_user params[:display_name]

+        return

       end
       end

-    elsif params[:language]
-      @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
-      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                        :conditions => {
-                                          :users => { :status => ["active", "confirmed"] },
-                                          :visible => true,
-                                          :language_code => params[:language]
-                                        },
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)

     elsif params[:friends]
       if @user
         @title = t 'diary_entry.list.title_friends'
     elsif params[:friends]
       if @user
         @title = t 'diary_entry.list.title_friends'

-        @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                          :conditions => {
-                                            :user_id => @user.friend_users,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = DiaryEntry.where(:user_id => @user.friend_users)

       else
           require_user
           return
       else
           require_user
           return


@@ -117,27 +91,30 @@ class DiaryEntryController < ApplicationController
     elsif params[:nearby]
       if @user
         @title = t 'diary_entry.list.title_nearby'
     elsif params[:nearby]
       if @user
         @title = t 'diary_entry.list.title_nearby'

-        @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                          :conditions => {
-                                            :user_id => @user.nearby,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = DiaryEntry.where(:user_id => @user.nearby)

       else
           require_user
           return
       end
     else
       else
           require_user
           return
       end
     else

-      @title = t 'diary_entry.list.title'
-      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                        :conditions => {
-                                          :users => { :status => ["active", "confirmed"] },
-                                          :visible => true
-                                        },
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+      
+      if params[:language]
+        @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+        @entries = @entries.where(:language_code => params[:language])
+      else
+        @title = t 'diary_entry.list.title'
+      end

     end
     end

+
+    @page = (params[:page] || 1).to_i
+    @page_size = 20
+
+    @entries = @entries.visible
+    @entries = @entries.order("created_at DESC")
+    @entries = @entries.offset((@page - 1) * @page_size)
+    @entries = @entries.limit(@page_size)
+    @entries = @entries.includes(:user, :language)

   end
 
   def rss
   end
 
   def rss


@@ -150,7 +127,8 @@ class DiaryEntryController < ApplicationController
         @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else

-        render :nothing => true, :status => :not_found
+        render :text => "", :status => :not_found
+        return

       end
     else
       @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
       end
     else
       @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })