zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 03:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging' of github.com:internetee/registry into staging

Browse source
This commit is contained in:
Stas 2015-11-11 11:59:38 +02:00
parent 6be6ca5a94
commit 40e74a2ed4
7 changed files with 65 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/admin/shared/form/_statuses.haml
View file

@ -9,8 +9,9 @@
.pull-left= t(:status)
.pull-right
- if model == 'domain'
= render 'admin/domains/form/pending_update', f: f, status: s
= render 'admin/domains/form/pending_delete', f: f, status: s
.hide-when-new
= render 'admin/domains/form/pending_update', f: f, status: s
= render 'admin/domains/form/pending_delete', f: f, status: s
= link_to(t(:delete), '#', class: 'btn btn-danger btn-xs js-destroy-status', style: delete_style)
.panel-body
.form-group
@ -37,6 +38,7 @@
if el.find('.js-disabled-value')
el.find('.js-disabled-value').remove()
el.find('.js-select').show()
el.find('.hide-when-new').hide()
el.find('.js-destroy-status').show()
$(document).on 'click', '.js-destroy-status', (e) ->