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

Merge branch '108869472-objects_archive' into staging

Browse source
This commit is contained in:
Stas 2016-03-16 18:51:37 +02:00
commit 0b6bd1b80e
6 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/contact_versions_controller.rb
View file

@ -30,7 +30,7 @@ class Admin::ContactVersionsController < AdminController
def show def show
per_page = 7 per_page = 7
@version = ContactVersion.find(params[:id]) @version = ContactVersion.find(params[:id])
@q = ContactVersion.where(item_id: @version.item_id).search @q = ContactVersion.where(item_id: @version.item_id).order(created_at: :asc).search
@versions = @q.result.page(params[:page]) @versions = @q.result.page(params[:page])
@versions = @versions.per(per_page) @versions = @versions.per(per_page)
end end

10
app/controllers/admin/domain_versions_controller.rb
View file

@ -9,12 +9,12 @@ class Admin::DomainVersionsController < AdminController
search_params = params[:q].deep_dup search_params = params[:q].deep_dup
if search_params[:registrant] if search_params[:registrant]
registrant = Contact.find_by_name(search_params[:registrant]) registrant = Contact.find_by(name: search_params[:registrant])
search_params.delete(:registrant) search_params.delete(:registrant)
end end
if search_params[:registrar] if search_params[:registrar]
registrar = Registrar.find_by_name(search_params[:registrar]) registrar = Registrar.find_by(name: search_params[:registrar])
search_params.delete(:registrar) search_params.delete(:registrar)
end end
@ -30,8 +30,8 @@ class Admin::DomainVersionsController < AdminController
end end
end end
whereS += " AND object->>'registrant_id' ~ '#{registrant.id}'" if registrant whereS += " AND object->>'registrant_id' = '#{registrant.id}'" if registrant
whereS += " AND object->>'registrar_id' ~ '#{registrar.id}'" if registrar whereS += " AND object->>'registrar_id' = '#{registrar.id}'" if registrar
versions = DomainVersion.includes(:item).where(whereS) versions = DomainVersion.includes(:item).where(whereS)
@q = versions.search(params[:q]) @q = versions.search(params[:q])
@ -44,7 +44,7 @@ class Admin::DomainVersionsController < AdminController
def show def show
per_page = 7 per_page = 7
@version = DomainVersion.find(params[:id]) @version = DomainVersion.find(params[:id])
@q = DomainVersion.where(item_id: @version.item_id).search @q = DomainVersion.where(item_id: @version.item_id).order(created_at: :desc).search
@versions = @q.result.page(params[:page]) @versions = @q.result.page(params[:page])
@versions = @versions.per(per_page) @versions = @versions.per(per_page)
end end

21
app/views/admin/contact_versions/index.haml
View file

@ -62,16 +62,17 @@
= t(:action) = t(:action)
%tbody %tbody
- @versions.each do |version| - @versions.each do |version|
%tr - if version.reify
%td= link_to(version.reify.name, admin_contact_version_path(version.id)) %tr
%td= version.reify.code %td= link_to(version.reify.name, admin_contact_version_path(version.id))
%td= ident_for(version.reify) %td= version.reify.code
%td= version.reify.phone %td= ident_for(version.reify)
%td %td= version.reify.phone
- if version.reify.registrar %td
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar)) - if version.reify.registrar
%td= l(version.created_at, format: :short) = link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
%td= version.event %td= l(version.created_at, format: :short)
%td= version.event
.row .row

6
app/views/admin/contact_versions/show.haml
View file

@ -5,7 +5,7 @@
.panel.panel-default{:style => "min-height:420px;"} .panel.panel-default{:style => "min-height:420px;"}
.panel-heading .panel-heading
%h3.panel-title %h3.panel-title
= l(@version.reify.updated_at, format: :short) = l(@version.created_at, format: :short)
= @version.event = @version.event
= plain_username(@version.terminator) = plain_username(@version.terminator)
.panel-body .panel-body
@ -85,12 +85,12 @@
- if vs.id == @version.id - if vs.id == @version.id
%li.active %li.active
= link_to admin_contact_version_path(vs.id) do = link_to admin_contact_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short) = l(vs.created_at, format: :short)
= vs.event = vs.event
- else - else
%li %li
= link_to admin_contact_version_path(vs.id) do = link_to admin_contact_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short) = l(vs.created_at, format: :short)
= vs.event = vs.event
%span{:style => "padding-left:10px; position: absolute; bottom: 10px;"} %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
= paginate @versions = paginate @versions

21
app/views/admin/domain_versions/archive.haml
View file

@ -55,16 +55,17 @@
= t(:action) = t(:action)
%tbody %tbody
- @versions.each do |version| - @versions.each do |version|
%tr - if version.reify
%td= link_to(version.reify.name, admin_domain_version_path(version.id)) %tr
%td %td= link_to(version.reify.name, admin_domain_version_path(version.id))
- if version.reify.registrant %td
= link_to(version.reify.registrant, admin_registrant_path(version.reify.registrant)) - if version.reify.registrant
%td = link_to(version.reify.registrant, admin_registrant_path(version.reify.registrant))
- if version.reify.registrar %td
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar)) - if version.reify.registrar
%td= l(version.created_at, format: :short) = link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
%td= version.event %td= l(version.created_at, format: :short)
%td= version.event
.row .row

8
app/views/admin/domain_versions/show.haml
View file

@ -15,7 +15,7 @@
.panel.panel-default{:style => "min-height:400px;"} .panel.panel-default{:style => "min-height:400px;"}
.panel-heading .panel-heading
%h3.panel-title %h3.panel-title
= l(@version.reify.updated_at, format: :short) = l(@version.created_at, format: :short)
= event = event
= creator = creator
.panel-body .panel-body
@ -80,15 +80,15 @@
.panel.panel-default{:style => "min-height:400px;"} .panel.panel-default{:style => "min-height:400px;"}
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
- @versions.each do |vs| - @versions.each do |vs|
- if vs.id == @version.id - if vs.id == @version.id and vs.reify
%li.active %li.active
= link_to admin_domain_version_path(vs.id) do = link_to admin_domain_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short) = l(vs.created_at, format: :short)
= vs.event = vs.event
- else - else
%li %li
= link_to admin_domain_version_path(vs.id) do = link_to admin_domain_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short) = l(vs.created_at, format: :short)
= vs.event = vs.event
%span{:style => "padding-left:10px; position: absolute; bottom: 10px;"} %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
= paginate @versions = paginate @versions