Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Martin Lensment 2014-11-12 19:05:42 +02:00
commit 38dc1c548b
45 changed files with 590 additions and 401 deletions

View file

@ -1,6 +0,0 @@
class Admin::ContactHistoriesController < AdminController
def index
@q = ContactVersion.deleted.search(params[:q])
@contacts = @q.result.page(params[:page])
end
end

View file

@ -1,18 +0,0 @@
class Admin::ContactVersionsController < AdminController
before_action :set_contact, only: [:show]
def index
@q = Contact.search(params[:q])
@contacts = @q.result.page(params[:page])
end
def show
@versions = @contact.versions
end
private
def set_contact
@contact = Contact.find(params[:id])
end
end

View file

@ -0,0 +1,5 @@
class Admin::DelayedJobsController < AdminController
def index
@jobs = Delayed::Job.all
end
end

View file

@ -1,6 +0,0 @@
class Admin::DomainHistoriesController < AdminController
def index
@q = DomainVersion.deleted.search(params[:q])
@domains = @q.result.page(params[:page])
end
end

View file

@ -1,18 +1,11 @@
class Admin::DomainVersionsController < AdminController
before_action :set_domain, only: [:show]
def index
@q = Domain.search(params[:q])
@q = DomainVersion.deleted.search(params[:q])
@domains = @q.result.page(params[:page])
end
def show
@versions = @domain.versions
end
private
def set_domain
@domain = Domain.find(params[:id])
@versions = DomainVersion.where(item_id: params[:id])
@name = @versions.last.name
end
end