diff --git a/app/controllers/registrar/bulk_change_controller.rb b/app/controllers/registrar/bulk_change_controller.rb index 441127f6c..1d9d606a4 100644 --- a/app/controllers/registrar/bulk_change_controller.rb +++ b/app/controllers/registrar/bulk_change_controller.rb @@ -4,9 +4,16 @@ class Registrar def new authorize! :manage, :repp + @expire_date = Time.zone.now.to_date render file: 'registrar/bulk_change/new', locals: { active_tab: default_tab } end + def bulk_renew + authorize! :manage, :repp + @expire_date = params[:expire_date].to_date + render file: 'registrar/bulk_change/new', locals: { active_tab: :bulk_renew } + end + private def available_contacts diff --git a/app/controllers/registrar/bulk_renew_controller.rb b/app/controllers/registrar/bulk_renew_controller.rb deleted file mode 100644 index 8818e416c..000000000 --- a/app/controllers/registrar/bulk_renew_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Registrar - class BulkRenewController < DeppController - def index; end - - def new - authorize! :manage, :repp - end - end -end diff --git a/app/views/registrar/bulk_change/_bulk_renew_form.html.erb b/app/views/registrar/bulk_change/_bulk_renew_form.html.erb index 38134e707..4b7cd392b 100644 --- a/app/views/registrar/bulk_change/_bulk_renew_form.html.erb +++ b/app/views/registrar/bulk_change/_bulk_renew_form.html.erb @@ -1,14 +1,14 @@ -<%= form_tag registrar_new_registrar_bulk_renew_path, multipart: true, class: 'form-horizontal' do %> +<%= form_with url: registrar_bulk_renew_path, multipart: true, class: 'form-horizontal' do |f|%> <%= render 'api_errors' %>
- <%= label_tag 'expire_date', t('.expire_date') %> + <%= f.label :expire_date, t('.expire_date') %>
- <%= text_field :expire_date, params[:expire_date], - class: 'form-control js-datepicker' %> + <%= f.text_field :expire_date, value: @expire_date, + class: 'form-control js-datepicker'%>
diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index d9f932a46..51e6a8bb3 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -33,4 +33,4 @@ en: bulk_renew_form: filter_btn: Filter - expire_date: Expire date + expire_date: Expire date until diff --git a/config/routes.rb b/config/routes.rb index 2a6930d3f..7bf1ecd39 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -133,8 +133,7 @@ Rails.application.routes.draw do end resources :domain_transfers, only: %i[new create] resource :bulk_change, controller: :bulk_change, only: :new - # resource :bulk_renew, controller: :bulk_renew #, only: :index - post '/registrar/bulk_renew/new', to: 'bulk_renew#new', as: :new_registrar_bulk_renew + post '/bulk_renew/new', to: 'bulk_change#bulk_renew', as: :bulk_renew resource :tech_contacts, only: :update resource :nameservers, only: :update resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do