Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #647250 by brianV: permissions page not in alphabetical order.

merge-requests/26/head
Dries Buytaert 2009-12-02 17:04:25 +00:00
parent 99833c6289
commit ef4513651e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/user/user.admin.inc
View File

@ -194,7 +194,7 @@ function user_admin_account() {
$users_roles[] = $roles[$user_role->rid]; $users_roles[] = $roles[$user_role->rid];
} }
asort($users_roles); asort($users_roles);
$options[$account->uid] = array( $options[$account->uid] = array(
'username' => theme('username', array('account' => $account)), 'username' => theme('username', array('account' => $account)),
'status' => $status[$account->status], 'status' => $status[$account->status],
@ -204,7 +204,7 @@ function user_admin_account() {
'operations' => array('data' => array('#type' => 'link', '#title' => t('edit'), '#href' => "user/$account->uid/edit", '#options' => array('query' => $destination))), 'operations' => array('data' => array('#type' => 'link', '#title' => t('edit'), '#href' => "user/$account->uid/edit", '#options' => array('query' => $destination))),
); );
} }
$form['accounts'] = array( $form['accounts'] = array(
'#type' => 'tableselect', '#type' => 'tableselect',
'#header' => $header, '#header' => $header,
@ -613,7 +613,7 @@ function user_admin_settings() {
$form['email_canceled']['settings'] = array( $form['email_canceled']['settings'] = array(
'#type' => 'container', '#type' => 'container',
'#states' => array( '#states' => array(
// Hide the settings when the cancel notify checkbox is disabled. // Hide the settings when the cancel notify checkbox is disabled.
'invisible' => array( 'invisible' => array(
'input[name="user_mail_status_canceled_notify"]' => array('checked' => FALSE), 'input[name="user_mail_status_canceled_notify"]' => array('checked' => FALSE),
), ),
@ -661,7 +661,16 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
$options = array(); $options = array();
$module_info = system_get_info('module'); $module_info = system_get_info('module');
$hide_descriptions = !system_admin_compact_mode(); $hide_descriptions = !system_admin_compact_mode();
// Get a list of all the modules implementing a hook_permission() and sort by
// display name.
$modules = array();
foreach (module_implements('permission') as $module) { foreach (module_implements('permission') as $module) {
$modules[$module_info[$module]['name']] = $module;
}
ksort($modules);
foreach ($modules as $display_name => $module) {
if ($permissions = module_invoke($module, 'permission')) { if ($permissions = module_invoke($module, 'permission')) {
$form['permission'][] = array( $form['permission'][] = array(
'#markup' => $module_info[$module]['name'], '#markup' => $module_info[$module]['name'],