translation_center 1.5.6 → 1.5.7

data/app/controllers/translation_center/center_controller.rb

@@ -23,15 +23,15 @@ module TranslationCenter
     end
 
     def dashboard
+      params[:page] ||= 1
+      @page = params[:page].to_i
       @stats = TranslationKey.langs_stats
       @langs = @stats.keys
       # to be used for meta search
       @search = Audited::Adapters::ActiveRecord::Audit.search(params[:search])
       #TODO perpage constant should be put somewhere else
-      @translations_changes = Translation.recent_changes.page(params[:page]).limit(5)
-      params[:page] ||= 1
-      @page = params[:page].to_i
-      @total_pages = Translation.recent_changes.count / 5
+      @translations_changes = Translation.recent_changes.offset(Translation::CHANGES_PER_PAGE * (@page - 1)).limit(Translation::CHANGES_PER_PAGE)
+      @total_pages = (Translation.recent_changes.count / (Translation::CHANGES_PER_PAGE * 1.0)).ceil
 
       respond_to do |format|
         format.html
@@ -40,10 +40,11 @@ module TranslationCenter
     end
 
     def search_activity
-      @translations_changes = Translation.recent_changes(params[:search]).page(params[:page]).limit(5)
       params[:page] ||= 1
       @page = params[:page].to_i
-      @total_pages =  Translation.recent_changes(params[:search]).count / 5
+
+      @translations_changes = Translation.recent_changes(params[:search]).offset(Translation::CHANGES_PER_PAGE * (@page - 1)).limit(Translation::CHANGES_PER_PAGE)
+      @total_pages =  (Translation.recent_changes(params[:search]).count / (Translation::CHANGES_PER_PAGE * 1.0)).ceil
       
       respond_to do |format|
         format.js

data/app/models/translation_center/translation.rb

@@ -6,6 +6,8 @@ module TranslationCenter
     # serialize as we could store arrays
     serialize :value
 
+    CHANGES_PER_PAGE = 5
+
     belongs_to :translation_key
     belongs_to :translator, polymorphic: true
 

data/app/views/translation_center/center/_activity.html.haml

@@ -34,15 +34,15 @@
             = distance_of_time_in_words_to_now change.created_at
             = t('.ago')
   .pagination
-    = link_to t('.first'), dashboard_path(page: 1)
+    = link_to t('.first'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=1"
     - if @page != 1
       |
-      = link_to t('.prev'), dashboard_path(page: @page - 1)
+      = link_to t('.prev'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=#{@page - 1}"
     |
-    = link_to t('.next'), dashboard_path(page: @page + 1)
+    = link_to t('.next'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=#{@page + 1}"
     - if @page != @total_pages
       |
-      = link_to t('.last'), dashboard_path(page: @total_pages)
+      = link_to t('.last'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=#{@total_pages}"
     = @page
     = t('.of')
     = @total_pages

data/app/views/translation_center/center/dashboard.html.haml

@@ -51,7 +51,7 @@
 %h1
   = t('.activity')
 .span12
-
+  
   = form_for @search, url: :search_activity, html: { method: :get, id: :search_form, class: 'pull-left form-search' } do |f|
     = f.text_field 'auditable_TranslationCenter::Translation_type_translation_key_name_matches', class: 'search_field input-medium',  placeholder: 'KEY'
 

data/lib/translation_center/engine.rb

@@ -4,11 +4,12 @@ require 'haml'
 require 'haml-rails'
 require 'acts_as_votable'
 require 'ya2yaml'
-require 'meta_search'
 require 'font-awesome-rails'
 require 'audited-activerecord'
 
 module TranslationCenter
+  require 'meta_search'
+
   class Engine < ::Rails::Engine
     isolate_namespace TranslationCenter
   end

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.5.6"
+  VERSION = "1.5.7"
 end