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

Merge branch 'master' of github.com:internetee/registry

Browse source
This commit is contained in:
Andres Keskküla 2014-09-26 13:05:07 +03:00
commit 3e0943189b
6 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/domains/form_partials/_statuses.haml
View file

@ -1,5 +1,5 @@
#domain_statuses
= f.fields_for :domain_statuses do |status_fields|
= f.fields_for :domain_statuses, @server_statuses do |status_fields|
.panel.panel-default
.panel-heading.clearfix
.pull-left= t('shared.status')
@ -15,7 +15,7 @@
.col-md-6
.form-group
= status_fields.label :value
= status_fields.select :value, options_for_select(DomainStatus.statuses_for_admin, status_fields.object.value.sub('server', '')), {include_blank: true}, {class: 'form-control'}
= status_fields.select :value, options_for_select(DomainStatus.statuses_for_admin, status_fields.object.value.try(:sub, 'server', '')), {include_blank: true}, {class: 'form-control'}
.col-md-6
.form-group
= status_fields.label :description

2
app/views/client/domains/edit.haml
View file

@ -4,6 +4,6 @@
= "#{t('shared.edit_domain')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.back_to_domain'), [:admin, @domain], class: 'btn btn-default')
= link_to(t('shared.back_to_domain'), [:client, @domain], class: 'btn btn-default')
%hr
= render 'form'

4
app/views/client/domains/form_partials/_statuses.haml
View file

@ -1,5 +1,5 @@
#domain_statuses
= f.fields_for :domain_statuses do |status_fields|
= f.fields_for :domain_statuses, @client_statuses do |status_fields|
.panel.panel-default
.panel-heading.clearfix
.pull-left= t('shared.status')
@ -15,7 +15,7 @@
.col-md-6
.form-group
= status_fields.label :value
= status_fields.select :value, options_for_select(DomainStatus.statuses_for_client, status_fields.object.value.sub('client', '')), {include_blank: true}, {class: 'form-control'}
= status_fields.select :value, options_for_select(DomainStatus.statuses_for_client, status_fields.object.value.try(:sub, 'client', '')), {include_blank: true}, {class: 'form-control'}
.col-md-6
.form-group
= status_fields.label :description