zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 18:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'story/113066359-optimization' into staging

Browse source 
# Conflicts:
#	app/models/blocked_domain.rb
This commit is contained in:
Vladimir Krylov 2016-02-11 08:38:30 +02:00
commit d68dfbb103
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/admin/account_activities_controller.rb
View file

@ -25,10 +25,11 @@ class Admin::AccountActivitiesController < AdminController
@account_activities = @q.result.page(params[:page]).per(params[:results_per_page]) @account_activities = @q.result.page(params[:page]).per(params[:results_per_page])
sort = @account_activities.orders.map(&:to_sql).join(",") sort = @account_activities.orders.map(&:to_sql).join(",")
# can do here inline SQL as it's our
if params[:page] && params[:page].to_i > 1 if params[:page] && params[:page].to_i > 1
@sum = @q.result.reorder(sort).limit(@account_activities.offset_value) + @b.result.where.not(id: @q.result.map(&:id)) @sum = @q.result.reorder(sort).limit(@account_activities.offset_value).sum(:sum) + @b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})").sum(:sum)
else else
@sum = @b.result.where.not(id: @q.result.map(&:id)) @sum = @b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})").sum(:sum)
end end
respond_to do |format| respond_to do |format|

6
app/views/admin/account_activities/index.haml
View file

@ -45,7 +45,7 @@
.col-md-3 .col-md-3
.col-md-2 .col-md-2
.col-md-4{class: 'text-right'} .col-md-4{class: 'text-right'}
= t(:starting_balance) + " #{@sum.to_a.map(&:sum).sum.to_f} EUR" = t(:starting_balance) + " #{@sum.to_f} EUR"
%hr %hr
@ -66,10 +66,10 @@
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'sum') = sort_link(@q, 'sum')
%tbody %tbody
-total = @sum.to_a.map(&:sum).sum.to_f -total = @sum.to_f
- @account_activities.each do |x| - @account_activities.each do |x|
%tr %tr
%td= link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar)) %td= x.account.registrar && link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar))
%td= x.description.present? ? x.description : '-' %td= x.description.present? ? x.description : '-'
%td= x.activity_type ? t(x.activity_type) : '' %td= x.activity_type ? t(x.activity_type) : ''
%td= l(x.created_at) %td= l(x.created_at)