zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'registry-341' into registry-268

Browse source
This commit is contained in:
Artur Beljajev 2017-01-19 12:07:21 +02:00
commit 5771d8535b
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/admin_users/show.haml
View file

@ -26,6 +26,6 @@
%dt= t(:role)
- if @admin_user.roles
%dd= t(@admin_user.roles.first)
%dd= @admin_user.roles.first
- else
%dd

4
app/views/admin/api_users/show.haml
View file

@ -29,7 +29,7 @@
%dt= t(:role)
%dd= @api_user.roles.join(', ')
%dt= t(:active)
%dt= t('.active')
%dd= @api_user.active
.row
.col-md-12
@ -47,7 +47,7 @@
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-10'}= t(:subject)
%th{class: 'col-xs-10'}= t('.subject')
%th{class: 'col-xs-2'}= t(:status)
%tbody
- @api_user.certificates.each do |x|