From bf044e77bb9872e362cd0ebea74e5f32bc701f8f Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Wed, 28 Jan 2015 12:00:53 +0200 Subject: [PATCH] Epp search --- app/assets/javascripts/app.js.coffee | 4 +- app/controllers/admin/epp_logs_controller.rb | 4 +- app/controllers/admin/repp_logs_controller.rb | 4 +- app/controllers/epp_controller.rb | 1 + app/views/admin/epp_logs/index.haml | 51 ++++++++++++++++++- app/views/admin/repp_logs/index.haml | 3 +- config/locales/en.yml | 3 ++ 7 files changed, 64 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app.js.coffee b/app/assets/javascripts/app.js.coffee index 27e7108bb..2bc26b09c 100644 --- a/app/assets/javascripts/app.js.coffee +++ b/app/assets/javascripts/app.js.coffee @@ -1,5 +1,7 @@ ready = -> - $('.selectize').selectize(); + $('.selectize').selectize({ + allowEmptyOption: true + }); $(document).ready(ready) $(document).on('page:load', ready) diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb index 5d58341aa..fdf19a8ef 100644 --- a/app/controllers/admin/epp_logs_controller.rb +++ b/app/controllers/admin/epp_logs_controller.rb @@ -2,7 +2,9 @@ class Admin::EppLogsController < ApplicationController load_and_authorize_resource class: ApiLog::EppLog def index - @epp_logs = ApiLog::EppLog.order(id: :desc).page(params[:page]) + @q = ApiLog::EppLog.search(params[:q]) + @q.sorts = 'id desc' if @q.sorts.empty? + @epp_logs = @q.result.page(params[:page]) end def show diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb index f9caefadc..2a8f0c619 100644 --- a/app/controllers/admin/repp_logs_controller.rb +++ b/app/controllers/admin/repp_logs_controller.rb @@ -2,7 +2,9 @@ class Admin::ReppLogsController < ApplicationController load_and_authorize_resource class: ApiLog::ReppLog def index - @repp_logs = ApiLog::ReppLog.order(id: :desc).page(params[:page]) + @q = ApiLog::ReppLog.search(params[:q]) + @q.sorts = 'id desc' if @q.sorts.empty? + @repp_logs = @q.result.page(params[:page]) end def show diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 484b6219e..013abf73e 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -172,6 +172,7 @@ class EppController < ApplicationController def write_to_epp_log # return nil if EPP_LOG_ENABLED + puts params[:epp_object_type] request_command = params[:command] || params[:action] # error receives :command, other methods receive :action ApiLog::EppLog.create({ request: params[:raw_frame] || params[:frame], diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml index f9bd5d573..255cd3b7d 100644 --- a/app/views/admin/epp_logs/index.haml +++ b/app/views/admin/epp_logs/index.haml @@ -1,9 +1,50 @@ .row .col-sm-12 %h2.text-center-xs= t('epp_logs') -%hr .row .col-md-12 + %hr + = search_form_for @q, url: [:admin, :epp_logs], html: { style: 'margin-bottom: 0;', class: 'js-form' } do |f| + .row + .col-md-3 + .form-group + = f.label :request_command + = f.select :request_command_eq, [[t('choose'),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t('choose') + .col-md-3 + .form-group + = f.label :request_object + = f.select :request_object_eq, [[t('choose'),''], 'contact', 'domain', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t('choose') + .col-md-3 + .form-group + = f.label :request_successful + = f.select :request_successful_true, [[t('choose'), ''], 'true', 'false'], {}, class: 'form-control selectize', placeholder: t('choose') + .col-md-3 + .form-group + = f.label :api_user + = f.search_field :api_user_name_cont, class: 'form-control', placeholder: t('api_user') + .row + .col-md-3 + .form-group + = f.label :registrar + = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t('registrar') + .col-md-3 + .form-group + = f.label :created_at + = f.search_field :created_at_gteq, class: 'form-control', placeholder: t('created_at') + .col-md-3 + .form-group + = f.label :created_at + = f.search_field :created_at_lteq, class: 'form-control', placeholder: t('created_at') + .col-md-3{style: 'padding-top: 25px;'} + %button.btn.btn-primary +   + %span.glyphicon.glyphicon-search +   + %button.btn.btn-default.js-reset-form + = t('clear_fields') +.row + .col-md-12 + %hr .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead @@ -13,7 +54,8 @@ %th{class: 'col-xs-2'}= t('request_successful') %th{class: 'col-xs-2'}= t('api_user') %th{class: 'col-xs-2'}= t('registrar') - %th{class: 'col-xs-2'}= t('created_at') + %th{class: 'col-xs-2'} + = sort_link(@q, 'created_at') %tbody - @epp_logs.each do |x| %tr @@ -26,3 +68,8 @@ .row .col-md-12 = paginate @epp_logs + +:coffee + $(".js-reset-form").on "click", (e) -> + e.preventDefault(); + window.location = "#{admin_epp_logs_path}" diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml index d4900f8c9..b90c9796b 100644 --- a/app/views/admin/repp_logs/index.haml +++ b/app/views/admin/repp_logs/index.haml @@ -13,7 +13,8 @@ %th{class: 'col-xs-2'}= t('response_code') %th{class: 'col-xs-2'}= t('api_user') %th{class: 'col-xs-2'}= t('registrar') - %th{class: 'col-xs-2'}= t('created_at') + %th{class: 'col-xs-2'} + = sort_link(@q, 'created_at') %tbody - @repp_logs.each do |x| %tr diff --git a/config/locales/en.yml b/config/locales/en.yml index a6e4c18ed..c05c1558b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -501,3 +501,6 @@ en: unknown_expiry_absolute_pattern: 'Expiry absolute must be compatible to ISO 8601' mutally_exclusive_params: 'Mutually exclusive parameters: %{params}' attribute_is_invalid: 'Attribute is invalid: %{attribute}' + request_successful: 'Request successful' + choose: 'Choose...' + clear_fields: 'Clear fields'