zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-28 11:11:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #652 from internetee/registry-407

Browse source 
Registry 407
This commit is contained in:
Timo Võhmar 2017-12-06 18:09:14 +02:00 • committed by GitHub
commit 50b1537161
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/shared/general-bootstrap.sass
View file

@ -65,6 +65,3 @@
.required:after
content: "*"
margin: 0 0 0 1px
.not-required:after
content: ''

39
app/views/admin/admin_users/_form.haml
View file

@ -1,10 +1,3 @@
- if @admin_user.new_record?
- overwrite_required = ''
- field_required = 'required'
- else
- overwrite_required = 'not-required' # otherwise automatic one adds required
- field_required = ''
= form_for([:admin, @admin_user], html: { class: 'form-horizontal', autocomplete: 'off' }) do |f|
= render 'shared/full_errors', object: @admin_user
@ -12,43 +5,41 @@
.col-md-8
.form-group
.col-md-4.control-label
= f.label :username
= f.label :username, nil, class: 'required'
.col-md-8
= f.text_field(:username, class: 'form-control')
= f.text_field :username, required: true, autofocus: true, class: 'form-control'
- if @admin_user.new_record? || can?(:update, AdminUser)
.form-group
.col-md-4.control-label
= f.label :password, class: overwrite_required
= f.label :password
.col-md-8
= f.text_field(:password, class: "form-control #{field_required}")
= f.text_field :password, required: f.object.new_record?, class: 'form-control'
.form-group
.col-md-4.control-label
= f.label :password_confirmation, class: overwrite_required
= f.label :password_confirmation
.col-md-8
= f.text_field(:password_confirmation, class: "form-control #{field_required}")
= f.text_field :password_confirmation, required: f.object.new_record?, class: 'form-control'
%hr
.form-group
.col-md-4.control-label
= f.label :identity_code
.col-md-8
= f.text_field(:identity_code, class: 'form-control required')
= f.text_field :identity_code, class: 'form-control'
.form-group
.col-md-4.control-label
= f.label :email
= f.label :email, nil, class: 'required'
.col-md-8
= f.email_field :email, class: 'form-control'
= f.email_field :email, required: true, class: 'form-control'
.form-group
.col-md-4.control-label
= f.label :country_code, t(:country)
= f.label :country_code, t(:country), class: 'required'
.col-md-8
= f.select(:country_code,
SortedCountry.all_options(f.object.country_code), {}, class: 'form-control required')
= f.select :country_code, SortedCountry.all_options(f.object.country_code), {}, required: true, class: 'form-control'
%hr
.form-group
.col-md-4.control-label
= f.label :role, class: 'required'
= f.label :role, nil, class: 'required'
.col-md-8
= select_tag 'admin_user[roles][]',
options_for_select(AdminUser::ROLES.map {|x| [t(x), x] },
@ -58,9 +49,3 @@
.row
.col-md-8.text-right
= button_tag(t(:save), class: 'btn btn-warning')
:javascript
window.addEventListener('load', function() {
$("#admin_user_password").removeAttr('required');
$("#admin_user_password_confirmation").removeAttr('required');
});

19
app/views/admin/api_users/_form.haml
View file

@ -1,11 +1,3 @@
- if @api_user.new_record?
- overwrite_required = ''
- field_required = 'required'
- else
- overwrite_required = 'not-required' # otherwise automatic one adds required
- field_required = ''
= form_for([:admin, @api_user], multipart: true,
html: {class: 'form-horizontal', autocomplete: 'off'}) do |f|
= render 'shared/full_errors', object: @api_user
@ -14,14 +6,14 @@
.col-md-8
.form-group
.col-md-4.control-label
= f.label :username
= f.label :username, nil, class: 'required'
.col-md-7
= f.text_field(:username, class: 'form-control')
= f.text_field :username, required: true, autofocus: true, class: 'form-control'
.form-group
.col-md-4.control-label
= f.label :password, class: overwrite_required
= f.label :password, nil, class: 'required'
.col-md-7
= f.text_field :password, class: "form-control #{field_required}", autocomplete: 'off'
= f.text_field :password, required: true, class: 'form-control'
.form-group
.col-md-4.control-label
@ -43,7 +35,7 @@
.form-group
.col-md-4.control-label
= f.label :role, class: 'required'
= f.label :role, nil, class: 'required'
.col-md-7
= select_tag 'api_user[roles][]',
options_for_select(ApiUser::ROLES.map {|x| [x, x] }, @api_user.roles.try(:first)),
@ -62,5 +54,4 @@
:javascript
window.addEventListener('load', function() {
Autocomplete.bindAdminRegistrarSearch();
$("#api_user_password").removeAttr('required');
});

30
config/initializers/autolabel.rb
View file

@ -1,30 +0,0 @@
class ActionView::Helpers::FormBuilder
alias_method :orig_label, :label
# add a 'required' CSS class to the field label if the field is required
# rubocop:disable Metrics/CyclomaticComplexity
# rubocop:disable Metrics/PerceivedComplexity
def label(method, content_or_options = nil, options = nil, &block)
if content_or_options && content_or_options.class == Hash
options = content_or_options
else
content = content_or_options
end
# rubocop:disable Style/MultilineOperationIndentation
if object.class.respond_to?(:validators_on) &&
object.class.validators_on(method).map(&:class).include?(ActiveRecord::Validations::PresenceValidator)
if options.class != Hash
options = { class: 'required' }
else
options[:class] = ((options[:class] || "") + ' required').split(' ').uniq.join(' ')
end
end
# rubocop:enable Style/MultilineOperationIndentation
orig_label(method, content, options || {}, &block)
end
# rubocop:enable Metrics/PerceivedComplexity
# rubocop:enable Metrics/CyclomaticComplexity
end