MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: Admin User index, view, edit i18n bug 

fix: User view i18n bug
pull/4293/head
4ekin 2019-03-12 16:55:38 +03:00
parent 840a2fb7e8
commit f79a18040b
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Users/admin_edit.ctp Normal file → Executable file
View File

@ -51,8 +51,8 @@
'label' => __('Organisation'),
));
}
echo $this->Form->input('role_id', array('label' => 'Role')); // TODO ACL, User edit role_id.
echo $this->Form->input('authkey', array('disabled' => 'disabled', 'label' => 'Authentication key', 'div' => 'input clear'));
echo $this->Form->input('role_id', array('label' => __('Role'))); // TODO ACL, User edit role_id.
echo $this->Form->input('authkey', array('disabled' => 'disabled', 'div' => 'input clear'));
echo $this->Form->input('nids_sid');
?>
<div id = "syncServers" class="hidden">

4
app/View/Users/admin_index.ctp Normal file → Executable file
View File

@ -58,8 +58,8 @@
),
array(
'type' => 'search',
'button' => 'Filter',
'placeholder' => 'Enter value to search',
'button' => __('Filter'),
'placeholder' => __('Enter value to search'),
'data' => '',
)
)

5
app/View/Users/admin_view.ctp Normal file → Executable file
View File

@ -95,12 +95,13 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
$this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
),
sprintf(
'<br /><a href="%s" class="btn btn-inverse" download>Download user profile for data portability</a>',
'<br /><a href="%s" class="btn btn-inverse" download>%s</a>',
sprintf(
'%s/users/view/%s.json',
$baseurl,
h($user['User']['id'])
)
),
__('Download user profile for data portability')
),
'<div id="userEvents"></div>',
$this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'viewUser'))

5
app/View/Users/view.ctp Normal file → Executable file
View File

@ -59,8 +59,9 @@
$this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
),
sprintf(
'<a href="%s" class="btn btn-inverse" download>Download user profile for data portability</a>',
$baseurl . '/users/view/me.json'
'<a href="%s" class="btn btn-inverse" download>%s</a>',
$baseurl . '/users/view/me.json',
__('Download user profile for data portability')
),
$this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'view'))
);