smartkiosk-server 0.10.9 → 0.10.10

data/app/admin/agents.rb

@@ -71,10 +71,13 @@ ActiveAdmin.register Agent do
         t.column :provider
         t.column :created_at
       end
-      button(
-        link_to I18n.t('smartkiosk.full_list'),
-        admin_payments_path(:q => {:agent_id_eq => agent.id})
-      )
+
+      div(:class => 'more') do
+        text_node link_to(
+          link_to I18n.t('smartkiosk.full_list'),
+          admin_payments_path(:q => {:agent_id_eq => agent.id})
+        )
+      end
     end
   end
 

data/app/admin/gateways.rb

@@ -137,7 +137,13 @@ ActiveAdmin.register Gateway do
         t.column :provider
         t.column :created_at
       end
-      button(link_to I18n.t('smartkiosk.full_list'), admin_payments_path(:q => {:gateway_id_eq => gateway.id}))
+
+      div(:class => 'more') do
+        text_node link_to(
+          I18n.t('smartkiosk.full_list'),
+          admin_payments_path(:q => {:gateway_id_eq => gateway.id})
+        )
+      end
     end
 
     active_admin_comments

data/app/admin/providers.rb

@@ -7,7 +7,7 @@ ActiveAdmin.register Provider do
 
   controller do
     def scoped_collection
-      Provider.includes(:provider_profile)
+      Provider.includes(:provider_profile, :gateways)
     end
   end
 
@@ -34,10 +34,16 @@ ActiveAdmin.register Provider do
     column :icon do |x|
       image_tag(x.icon.url(:thumb)) unless x.icon.blank?
     end
-    column :provider_profile
+    column :title, :sortable => :title do |x|
+      link_to x.title, [:admin, x]
+    end
     column :keyword
-    column :title
-    column :provider_gateways_count
+    column :provider_profile
+    column :provider_gateways_count, :sortable => :provider_gateways_count do |x|
+      x.gateways.map do |g|
+        link_to g.title, [:admin, g]
+      end.join(', ').html_safe
+    end
     column :updated_at
     default_actions
   end
@@ -115,10 +121,13 @@ ActiveAdmin.register Provider do
         t.column :provider
         t.column :created_at
       end
-      button(
-        link_to I18n.t('smartkiosk.full_list'),
-        admin_payments_path(:q => {:provider_id_eq => provider.id})
-      )
+
+      div(:class => 'more') do
+        text_node link_to(
+          link_to I18n.t('smartkiosk.full_list'),
+          admin_payments_path(:q => {:provider_id_eq => provider.id})
+        )
+      end
     end
 
     active_admin_comments

data/app/admin/terminals.rb

@@ -340,10 +340,13 @@ ActiveAdmin.register Terminal do
         t.column :modem_balance
         t.column :modem_signal_level
       end
-      button(
-        link_to I18n.t('smartkiosk.admin.panels.terminals.all_pings'),
-        pings_admin_terminal_path(terminal.id)
-      )
+
+      div(:class => 'more') do
+        text_node link_to(
+          I18n.t('smartkiosk.admin.panels.terminals.all_pings'),
+          pings_admin_terminal_path(terminal.id)
+        )
+      end
     end
 
     panel I18n.t('activerecord.models.collection.other') do
@@ -353,10 +356,13 @@ ActiveAdmin.register Terminal do
         t.column :approved_payments_sum
         t.column :collected_at
       end
-      button(
-        link_to I18n.t('smartkiosk.full_list'),
-        admin_collections_path(:q => {:terminal_id_eq => terminal.id})
-      )
+
+      div(:class => 'more') do
+        text_node link_to(
+         link_to I18n.t('smartkiosk.full_list'),
+          admin_collections_path(:q => {:terminal_id_eq => terminal.id})
+        )
+      end
     end
 
     active_admin_comments

data/app/assets/stylesheets/active_admin.css.scss

@@ -32,6 +32,14 @@ body.active_admin {
     color: #414141;
   }
 
+  .panel {
+    .more {
+      font-weight: bold;
+      margin-top: 10px;
+      font-size: 1.1em;
+    }
+  }
+
   //
   // WRAPPER
   //

data/app/views/admin/terminals/pings.html.arb

@@ -1,55 +1,57 @@
-table_for(terminal.pings, :class => 'index_table index', :i18n => TerminalPing) do |t|
-  t.column :created_at
-  t.column :condition do |x|
-    status_tag I18n.t("smartkiosk.terminal_conditions.#{x.condition}"), x.condition.to_sym
-  end
-  t.column :state do |x|
-    I18n.t "smartkiosk.terminal_states.#{x.state}"
-  end
-  t.column :version
-  t.column :ip
-  t.column :queues do |x|
-    ul do
-      x.queues.each do |queue, count|
-        li :style => 'white-space: nowrap' do
-          b queue+':'
-          span count
+paginated_collection(Kaminari.paginate_array(terminal.pings).page(params[:page]).per(15), download_links: false) do
+  table_for(collection, :class => 'index_table index', :i18n => TerminalPing) do |t|
+    t.column :created_at
+    t.column :condition do |x|
+      status_tag I18n.t("smartkiosk.terminal_conditions.#{x.condition}"), x.condition.to_sym
+    end
+    t.column :state do |x|
+      I18n.t "smartkiosk.terminal_states.#{x.state}"
+    end
+    t.column :version
+    t.column :ip
+    t.column :queues do |x|
+      ul do
+        x.queues.each do |queue, count|
+          li :style => 'white-space: nowrap' do
+            b queue+':'
+            span count
+          end
         end
       end
     end
-  end
-  t.column :banknotes do |x|
-    ul do
-      x.banknotes.each do |banknote, count|
-        li :style => 'white-space: nowrap' do
-          b banknote+':'
-          span count
+    t.column :banknotes do |x|
+      ul do
+        x.banknotes.each do |banknote, count|
+          li :style => 'white-space: nowrap' do
+            b banknote+':'
+            span count
+          end
         end
       end
     end
-  end
-  Terminal::HARDWARE.each do |hardware|
-    t.column :"#{hardware}_error" do |x|
-      div :style => 'white-space: nowrap' do
-        if x.error(hardware).blank?
-          status_tag I18n.t('formtastic.no'), :ok
-        else
-          status_tag(
-            (
-              I18n.t("smartkiosk.hardware.#{hardware}.errors")[x.error(hardware)] ||
-              I18n.t('smartkiosk.unlocalized') + " (#{x.error(hardware)})"
-            ),
-            :error
-          )
+    Terminal::HARDWARE.each do |hardware|
+      t.column :"#{hardware}_error" do |x|
+        div :style => 'white-space: nowrap' do
+          if x.error(hardware).blank?
+            status_tag I18n.t('formtastic.no'), :ok
+          else
+            status_tag(
+              (
+                I18n.t("smartkiosk.hardware.#{hardware}.errors")[x.error(hardware)] ||
+                I18n.t('smartkiosk.unlocalized') + " (#{x.error(hardware)})"
+              ),
+              :error
+            )
+          end
         end
       end
     end
+    t.column :cash_sum
+    t.column :cash_count
+    t.column :cash_acceptor_version
+    t.column :printer_version
+    t.column :modem_balance
+    t.column :modem_signal_level
+    t.column :modem_version
   end
-  t.column :cash_sum
-  t.column :cash_count
-  t.column :cash_acceptor_version
-  t.column :printer_version
-  t.column :modem_balance
-  t.column :modem_signal_level
-  t.column :modem_version
 end

data/config/deploy.rb

@@ -20,7 +20,7 @@ set :user, "deployer"
 set :deploy_to, "/home/deployer/www/#{application}"
 
 after 'deploy:update_code', 'deploy:configure'
-before 'deploy:create_symlink', 'deploy:install'
+before 'deploy:create_symlink', 'deploy:install' if ENV['DEPLOY_DB']
 
 namespace :deploy do
   task :configure do

data/config/initializers/active_admin.rb

@@ -8,6 +8,7 @@ require 'active_admin/inputs/filter_date_range_input_fix'
 require 'paper_trail/version_fix'
 require 'formtastic/inputs/selectable_check_boxes'
 require 'dav4rack/build_resource'
+require 'kaminari/array_extension_fix'
 
 ActiveAdmin.setup do |config|
   # TODO: Remove this as soon as AA fixed

data/config/locales/active_admin.ru.yml

@@ -59,6 +59,8 @@ ru:
       empty: "%{model} не найдено"
       entry:
         one: "запись"
+        few: "записей"
+        many: "записей"
         other: "записей"
       multiple: "Результат: %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> из <b>%{total}</b>"
       one: "Результат: <b>1</b> %{model}"

data/config/locales/activerecord.ru.yml

@@ -44,6 +44,11 @@ ru:
             min:
               too_large: должно быть меньше До
     models:
+      terminal_ping:
+        few: Пинга
+        many: Пингов
+        one: Пинг
+        other: Пинги
       terminal_profile_promotion:
         few: Быстрые иконки
         many: Быстрых иконок

data/lib/kaminari/array_extension_fix.rb

@@ -0,0 +1,10 @@
+module Kaminari
+  class PaginatableArray < Array
+    # AA tries to reorder selection to ease SQL count query
+    # In cases when we use array as a collection source we 
+    #   need this method to do nothing and be chainable
+    def reorder(*args)
+      self
+    end
+  end
+end

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.9'
+    VERSION = '0.10.10'
   end
 end

data/lib/smartkiosk/server.rb

@@ -21,9 +21,9 @@ module Smartkiosk
         end
 
         # ActiveAdmin
-        ActiveAdmin.setup do |config|
-          config.load_paths << Smartkiosk::Server::Engine.root.join('app/admin').to_s
-        end
+        aa_load_path = Smartkiosk::Server::Engine.root.join('app/admin').to_s
+        ActiveAdmin.application.load_paths << aa_load_path
+        config.eager_load_paths.reject!{|x| x == aa_load_path}
 
         # TODO: Remove this as soon as AA fixed
         config.after_initialize do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -272,6 +272,7 @@ files:
 - lib/dav4rack/build_resource.rb
 - lib/formtastic/inputs/selectable_check_boxes.rb
 - lib/gem_stasher.rb
+- lib/kaminari/array_extension_fix.rb
 - lib/paper_trail/version_fix.rb
 - lib/report_builder.rb
 - lib/seeder.rb
@@ -321,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1984096690378961328
+      hash: -3287935658302651935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -330,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1984096690378961328
+      hash: -3287935658302651935
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23