From 0a3e631d846f9a1b53aaf75d7b64255f241c4bd4 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Tue, 30 Sep 2014 16:01:48 +0300
Subject: [PATCH] Add validations to epp users

---
 app/models/epp_user.rb               |  3 +++
 app/views/admin/epp_users/_form.haml |  6 +++---
 app/views/admin/epp_users/show.haml  |  3 +++
 app/views/admin/users/_form.haml     |  2 +-
 app/views/layouts/application.haml   |  8 +++-----
 config/locales/en.yml                | 14 +++++++++++++-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/models/epp_user.rb b/app/models/epp_user.rb
index 2def5f90a..ba95733cd 100644
--- a/app/models/epp_user.rb
+++ b/app/models/epp_user.rb
@@ -3,6 +3,9 @@ class EppUser < ActiveRecord::Base
   belongs_to :registrar
   has_many :contacts
 
+  validates :username, :password, :registrar, presence: true
+  validates :username, uniqueness: true
+
   attr_accessor :registrar_typeahead
 
   def registrar_typeahead
diff --git a/app/views/admin/epp_users/_form.haml b/app/views/admin/epp_users/_form.haml
index 46a75c01e..8e619b8ce 100644
--- a/app/views/admin/epp_users/_form.haml
+++ b/app/views/admin/epp_users/_form.haml
@@ -16,7 +16,7 @@
         = f.text_field(:password, class: 'form-control')
       .form-group
         .form-group.has-feedback.js-typeahead-container
-          = f.label :registrar_typeahead
+          = f.label :registrar_typeahead, t('shared.registrar')
           = f.text_field(:registrar_typeahead, class: 'form-control js-registrar-typeahead', placeholder: t('shared.registrar'), autocomplete: 'off')
           %span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
           %span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
@@ -29,8 +29,8 @@
 
     .col-md-6.text-left
       .form-group
-        = f.label :crt, t('shared.crt')
-        = f.text_area :crt, class: 'form-control'
+        = f.label :csr, t('shared.certificate_signing_req')
+        = f.text_area :csr, class: 'form-control'
   %hr
   .row
     .col-md-12.text-right
diff --git a/app/views/admin/epp_users/show.haml b/app/views/admin/epp_users/show.haml
index 664b6f91f..c3a17b1e2 100644
--- a/app/views/admin/epp_users/show.haml
+++ b/app/views/admin/epp_users/show.haml
@@ -36,5 +36,8 @@
         %h3.panel-title= t('shared.certificates')
       .panel-body
         %dl.dl-horizontal
+          %dt= t('shared.csr')
+          %dd= @epp_user.csr
+
           %dt= t('shared.crt')
           %dd= @epp_user.crt
diff --git a/app/views/admin/users/_form.haml b/app/views/admin/users/_form.haml
index 8c54035ff..7f32be38c 100644
--- a/app/views/admin/users/_form.haml
+++ b/app/views/admin/users/_form.haml
@@ -27,7 +27,7 @@
         = f.text_field(:email, class: 'form-control')
       .form-group
         .form-group.has-feedback.js-typeahead-container
-          = f.label :registrar_typeahead
+          = f.label :registrar_typeahead, t('shared.registrar')
           = f.text_field(:registrar_typeahead, class: 'form-control js-registrar-typeahead', placeholder: t('shared.registrar'), autocomplete: 'off')
           %span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
           %span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index 478972009..62ec5aab2 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -37,14 +37,12 @@
                 %li.dropdown-header= t('shared.system')
                 %li
                   = link_to t('shared.setting_groups'), admin_setting_groups_path
-                %li
-                  = link_to t('shared.users'), admin_users_path
+                %li.divider
+                %li.dropdown-header= t('shared.users')
                 %li
                   = link_to t('shared.epp_users'), admin_epp_users_path
-                %li.divider
-                %li.dropdown-header= 'Something else'
                 %li
-                  %a{href: "#"} Link
+                  = link_to t('shared.users'), admin_users_path
           %ul.nav.navbar-nav.navbar-right
             %li= link_to t('shared.log_out'), '/logout'
         / /.nav-collapse
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 30720c4ef..65eab6e3c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -171,6 +171,16 @@ en:
             registrar:
               blank: 'Registrar is missing'
 
+        epp_user:
+          attributes:
+            username:
+              blank: 'Username is missing'
+              taken: 'Username already exists'
+            password:
+              blank: 'Password is missing'
+            registrar:
+              blank: 'Registrar is missing'
+
     attributes:
       epp_domain: &epp_domain_attributes
         name: 'Domain name'
@@ -355,7 +365,9 @@ en:
     back_to_user: 'Back to user'
 
     create_new_epp_user: 'Create new EPP user'
-    crt: 'Certificate'
+    certificate_signing_req: 'Certificate signing request'
+    csr: 'CSR'
+    crt: 'CRT'
     epp_user_details: 'EPP user details'
     edit_epp_user: 'Edit EPP user'
     back_to_epp_user: 'Back to EPP user'