From 1fe850b6dc0147f04b3a48cc5057be3b76f5e4a1 Mon Sep 17 00:00:00 2001 From: kikito Date: Thu, 1 Oct 2015 19:27:04 +0200 Subject: [PATCH] Renaming of management validations --- .../document_verifications_controller.rb | 41 +++++++++++++++++++ .../email_verifications_controller.rb | 25 +++++++++++ .../on_site_verification_emails_controller.rb | 25 ----------- .../on_site_verifications_controller.rb | 41 ------------------- .../{on_site.rb => management/document.rb} | 2 +- .../{on_site_email.rb => management/email.rb} | 2 +- app/views/management/_menu.html.erb | 5 ++- .../index.html.erb | 5 ++- .../invalid_document.html.erb | 4 +- .../new.html.erb | 10 ++--- .../verified.html.erb | 8 ++-- .../new.html.erb | 8 ++-- .../sent.html.erb | 8 ++-- .../already_verified.html.erb | 25 ----------- config/routes.rb | 6 +-- 15 files changed, 97 insertions(+), 118 deletions(-) create mode 100644 app/controllers/management/document_verifications_controller.rb create mode 100644 app/controllers/management/email_verifications_controller.rb delete mode 100644 app/controllers/management/on_site_verification_emails_controller.rb delete mode 100644 app/controllers/management/on_site_verifications_controller.rb rename app/models/verification/{on_site.rb => management/document.rb} (92%) rename app/models/verification/{on_site_email.rb => management/email.rb} (95%) rename app/views/management/{on_site_verifications => document_verifications}/index.html.erb (81%) rename app/views/management/{on_site_verifications => document_verifications}/invalid_document.html.erb (83%) rename app/views/management/{on_site_verifications => document_verifications}/new.html.erb (65%) rename app/views/management/{on_site_verifications => document_verifications}/verified.html.erb (68%) rename app/views/management/{on_site_verification_emails => email_verifications}/new.html.erb (74%) rename app/views/management/{on_site_verification_emails => email_verifications}/sent.html.erb (67%) delete mode 100644 app/views/management/on_site_verifications/already_verified.html.erb diff --git a/app/controllers/management/document_verifications_controller.rb b/app/controllers/management/document_verifications_controller.rb new file mode 100644 index 000000000..17ae484d9 --- /dev/null +++ b/app/controllers/management/document_verifications_controller.rb @@ -0,0 +1,41 @@ +class Management::DocumentVerificationsController < Management::BaseController + + def index + @document_verification = Verification::Management::Document.new() + end + + def check + @document_verification = Verification::Management::Document.new(document_verification_params) + + if @document_verification.valid? + if @document_verification.verified? + render :verified + elsif @document_verification.user? + render :new + elsif @document_verification.in_census? + redirect_to new_management_email_verification_path(email_verification: document_verification_params) + else + render :invalid_document + end + else + render :index + end + end + + def create + @document_verification = Verification::Management::Document.new(document_verification_params) + @document_verification.verify + render :verified + end + + private + + def document_verification_params + params.require(:document_verification).permit(:document_type, :document_number) + end + + +end + + + diff --git a/app/controllers/management/email_verifications_controller.rb b/app/controllers/management/email_verifications_controller.rb new file mode 100644 index 000000000..7d2fa604f --- /dev/null +++ b/app/controllers/management/email_verifications_controller.rb @@ -0,0 +1,25 @@ +class Management::EmailVerificationsController < Management::BaseController + + def new + @email_verification = Verification::Management::Email.new(email_verification_params) + end + + def create + @email_verification = Verification::Email.new(email_verification_params) + + if @email_verification.valid? + @email_verification.send_email + render :sent + else + render :new + end + end + + private + + def email_verification_params + params.require(:email_verification).permit(:document_type, :document_number, :email) + end + +end + diff --git a/app/controllers/management/on_site_verification_emails_controller.rb b/app/controllers/management/on_site_verification_emails_controller.rb deleted file mode 100644 index 52fb8b279..000000000 --- a/app/controllers/management/on_site_verification_emails_controller.rb +++ /dev/null @@ -1,25 +0,0 @@ -class Management::OnSiteVerificationEmailsController < Management::BaseController - - def new - @verification_on_site_email = Verification::OnSiteEmail.new(verification_on_site_email_params) - end - - def create - @verification_on_site_email = Verification::OnSiteEmail.new(verification_on_site_email_params) - - if @verification_on_site_email.valid? - @verification_on_site_email.send_email - render :sent - else - render :new - end - end - - private - - def verification_on_site_email_params - params.require(:verification_on_site_email).permit(:document_type, :document_number, :email) - end - -end - diff --git a/app/controllers/management/on_site_verifications_controller.rb b/app/controllers/management/on_site_verifications_controller.rb deleted file mode 100644 index 46409c869..000000000 --- a/app/controllers/management/on_site_verifications_controller.rb +++ /dev/null @@ -1,41 +0,0 @@ -class Management::OnSiteVerificationsController < Management::BaseController - - def index - @verification_on_site = Verification::OnSite.new() - end - - def check - @verification_on_site = Verification::OnSite.new(verification_on_site_params) - - if @verification_on_site.valid? - if @verification_on_site.verified? - render :verified - elsif @verification_on_site.user? - render :new - elsif @verification_on_site.in_census? - redirect_to new_management_on_site_verification_email_path(verification_on_site_email: verification_on_site_params) - else - render :invalid_document - end - else - render :index - end - end - - def create - @verification_on_site = Verification::OnSite.new(verification_on_site_params) - @verification_on_site.verify - render :verified - end - - private - - def verification_on_site_params - params.require(:verification_on_site).permit(:document_type, :document_number) - end - - -end - - - diff --git a/app/models/verification/on_site.rb b/app/models/verification/management/document.rb similarity index 92% rename from app/models/verification/on_site.rb rename to app/models/verification/management/document.rb index f7c3c20e7..69ab1affc 100644 --- a/app/models/verification/on_site.rb +++ b/app/models/verification/management/document.rb @@ -1,4 +1,4 @@ -class Verification::OnSite +class Verification::Management::Document include ActiveModel::Model attr_accessor :document_type diff --git a/app/models/verification/on_site_email.rb b/app/models/verification/management/email.rb similarity index 95% rename from app/models/verification/on_site_email.rb rename to app/models/verification/management/email.rb index abe61d4f7..0f9842caf 100644 --- a/app/models/verification/on_site_email.rb +++ b/app/models/verification/management/email.rb @@ -1,4 +1,4 @@ -class Verification::OnSiteEmail +class Verification::Management::Email include ActiveModel::Model attr_accessor :document_type diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb index 74c5151d4..dd0558e83 100644 --- a/app/views/management/_menu.html.erb +++ b/app/views/management/_menu.html.erb @@ -4,8 +4,9 @@ <%= link_to t("management.dashboard.index.title"), management_root_path %> -
  • > - <%= link_to management_on_site_verifications_path do %> +
  • > + <%= link_to management_document_verifications_path do %> <%= t("management.menu.on_site_verifications") %> <% end %> diff --git a/app/views/management/on_site_verifications/index.html.erb b/app/views/management/document_verifications/index.html.erb similarity index 81% rename from app/views/management/on_site_verifications/index.html.erb rename to app/views/management/document_verifications/index.html.erb index 41f62bd70..d87b83b06 100644 --- a/app/views/management/on_site_verifications/index.html.erb +++ b/app/views/management/document_verifications/index.html.erb @@ -2,7 +2,10 @@
    - <%= form_for @verification_on_site, url: check_management_on_site_verifications_path do |f| %> + <%= form_for(@document_verification, + as: :document_verification, + url: check_management_document_verifications_path) do |f| %> +
    <%= f.select(:document_type, [[humanize_document_type("1"), 1], diff --git a/app/views/management/on_site_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb similarity index 83% rename from app/views/management/on_site_verifications/invalid_document.html.erb rename to app/views/management/document_verifications/invalid_document.html.erb index c95d3c01e..d662b6c08 100644 --- a/app/views/management/on_site_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -1,6 +1,6 @@
    diff --git a/app/views/management/on_site_verifications/new.html.erb b/app/views/management/document_verifications/new.html.erb similarity index 65% rename from app/views/management/on_site_verifications/new.html.erb rename to app/views/management/document_verifications/new.html.erb index cc7d6e914..ad9623107 100644 --- a/app/views/management/on_site_verifications/new.html.erb +++ b/app/views/management/document_verifications/new.html.erb @@ -1,8 +1,8 @@
    @@ -20,7 +20,7 @@
  • <%= t("management.users.user_permission_votes") %>
    • - <%= form_for @verification_on_site, url: management_on_site_verifications_path do |f| %> + <%= form_for @document_verification, url: management_on_site_verifications_path do |f| %> <%= f.hidden_field :document_type %> <%= f.hidden_field :document_number %> <%= f.submit t("management.users.verify"), class: "button success radius" %> diff --git a/app/views/management/on_site_verifications/verified.html.erb b/app/views/management/document_verifications/verified.html.erb similarity index 68% rename from app/views/management/on_site_verifications/verified.html.erb rename to app/views/management/document_verifications/verified.html.erb index 60b81566c..dae7ce17a 100644 --- a/app/views/management/on_site_verifications/verified.html.erb +++ b/app/views/management/document_verifications/verified.html.erb @@ -1,8 +1,8 @@

    - <%= t("management.document_type_label") %> <%= humanize_document_type(@verification_on_site.document_type) %> - <%= t("management.document_number") %> <%= @verification_on_site.document_number %> - <%= t("management.username_label") %> <%= @verification_on_site.user.username %> - <%= t("management.email_label") %> <%= @verification_on_site.user.email %> + <%= t("management.document_type_label") %> <%= humanize_document_type(@document_verification.document_type) %> + <%= t("management.document_number") %> <%= @document_verification.document_number %> + <%= t("management.username_label") %> <%= @document_verification.user.username %> + <%= t("management.email_label") %> <%= @document_verification.user.email %>

    diff --git a/app/views/management/on_site_verification_emails/new.html.erb b/app/views/management/email_verifications/new.html.erb similarity index 74% rename from app/views/management/on_site_verification_emails/new.html.erb rename to app/views/management/email_verifications/new.html.erb index bafc1e11d..d6987cf26 100644 --- a/app/views/management/on_site_verification_emails/new.html.erb +++ b/app/views/management/email_verifications/new.html.erb @@ -1,6 +1,6 @@
    @@ -13,7 +13,9 @@

    <%= t("management.users.has_account_note") %>

    - <%= form_for @verification_on_site_email, url: management_on_site_verification_emails_path do |f| %> + <%= form_for @email_verification, + as: :email_verification, + url: management_email_verifications_path do |f| %> <%= f.hidden_field :document_type %> <%= f.hidden_field :document_number %> <%= f.text_field :email, label: false, placeholder: t('management.users.has_account_placeholder') %> diff --git a/app/views/management/on_site_verification_emails/sent.html.erb b/app/views/management/email_verifications/sent.html.erb similarity index 67% rename from app/views/management/on_site_verification_emails/sent.html.erb rename to app/views/management/email_verifications/sent.html.erb index d3aa3035d..470e9c292 100644 --- a/app/views/management/on_site_verification_emails/sent.html.erb +++ b/app/views/management/email_verifications/sent.html.erb @@ -1,8 +1,8 @@
    diff --git a/app/views/management/on_site_verifications/already_verified.html.erb b/app/views/management/on_site_verifications/already_verified.html.erb deleted file mode 100644 index 60b81566c..000000000 --- a/app/views/management/on_site_verifications/already_verified.html.erb +++ /dev/null @@ -1,25 +0,0 @@ - - -
    - <%= t("management.users.already_verified") %> -
    - -
    - -

    <%= t("management.users.census_success_info") %>

    - -
      -
    • <%= t("management.users.user_permission_debates") %>
      • -
    • <%= t("management.users.user_permission_proposal") %>
      • -
    • <%= t("management.users.user_permission_support_proposal") %>
      • -
    • <%= t("management.users.user_permission_votes") %>
      • -
    - -
    - -<%= t("management.print_info") %> diff --git a/config/routes.rb b/config/routes.rb index ca8ee1e12..50d8283d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -166,15 +166,13 @@ Rails.application.routes.draw do namespace :management do root to: "dashboard#index" - resources :on_site_verifications, only: [:index, :new, :create] do + resources :document_verifications, only: [:index, :new, :create] do collection do post :check end end - resources :on_site_verification_emails, only: [:new, :create] - - + resources :email_verifications, only: [:new, :create] end # Example of regular route: