From 000b0fc1408f8fa0a00f5fc4b542f8e5fee4c1b4 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Mon, 23 Mar 2015 17:16:24 +0200 Subject: [PATCH 1/2] Allow entering identity codes to api user --- app/controllers/admin/api_users_controller.rb | 2 +- app/views/admin/api_users/_form.haml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb index 27bed6a80..c3c359e3c 100644 --- a/app/controllers/admin/api_users_controller.rb +++ b/app/controllers/admin/api_users_controller.rb @@ -54,6 +54,6 @@ class Admin::ApiUsersController < AdminController end def api_user_params - params.require(:api_user).permit(:username, :password, :active, :registrar_id, :registrar_typeahead) + params.require(:api_user).permit(:username, :password, :active, :registrar_id, :registrar_typeahead, :identity_code) end end diff --git a/app/views/admin/api_users/_form.haml b/app/views/admin/api_users/_form.haml index 29f8b1179..9d1a635a5 100644 --- a/app/views/admin/api_users/_form.haml +++ b/app/views/admin/api_users/_form.haml @@ -14,6 +14,9 @@ .form-group = f.label :password = f.text_field(:password, class: 'form-control') + .form-group + = f.label :identity_code + = f.text_field(:identity_code, class: 'form-control') .form-group .form-group.has-feedback.js-typeahead-container = f.label :registrar_typeahead, t('registrar') From 717de1c886d7aaf684eda2f74c5a8aea9311c66e Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 23 Mar 2015 17:21:45 +0200 Subject: [PATCH 2/2] Updated creator helper --- app/helpers/application_helper.rb | 2 ++ spec/features/admin/contact_spec.rb | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 06d17b8c8..98d3b0b58 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -20,6 +20,7 @@ module ApplicationHelper def creator_link(model) return 'not present' if model.blank? + return 'unknown' if model.creator.blank? return model.creator if model.creator.is_a? String # can be api user or some other user @@ -28,6 +29,7 @@ module ApplicationHelper def updator_link(model) return 'not present' if model.blank? + return 'unknown' if model.updator.blank? return model.updator if model.updator.is_a? String # can be api user or some other user diff --git a/spec/features/admin/contact_spec.rb b/spec/features/admin/contact_spec.rb index a0b36e181..afd67c296 100644 --- a/spec/features/admin/contact_spec.rb +++ b/spec/features/admin/contact_spec.rb @@ -20,6 +20,8 @@ feature 'Admin contact', type: :feature do visit admin_contacts_url click_link('Mr John') - page.should have_content('by autotest') + # initially it's created by unknown, + # indivitually running it's created by autotest + page.should have_content(/by [unknown|autotest]/) end end