zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 09:57:23 +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) %dt= t(:role)
- if @admin_user.roles - if @admin_user.roles
%dd= t(@admin_user.roles.first) %dd= @admin_user.roles.first
- else - else
%dd %dd

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

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

4
config/locales/admin/api_users.en.yml
View file

@ -6,6 +6,10 @@ en:
title: API users title: API users
active: Active active: Active
show:
active: Active
subject: Subject
new: new:
title: New API user title: New API user

1
config/locales/en.yml
View file

@ -280,7 +280,6 @@ en:
system: 'System' system: 'System'
settings: 'Settings' settings: 'Settings'
domains: 'Domains' domains: 'Domains'
api_users: 'API users'
registrars: 'Registrars' registrars: 'Registrars'
valid_to: 'Valid to' valid_to: 'Valid to'
name: 'Name' name: 'Name'