From 2ff1f051831127a4ca4b6a03d509226421179688 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Wed, 9 Sep 2015 13:07:11 +0800 Subject: [PATCH] MDL-51357 roles: fix table layout after MDL-38763 --- admin/roles/classes/capability_table_with_risks.php | 3 +-- admin/roles/classes/define_role_table_advanced.php | 10 ++++++---- admin/roles/classes/define_role_table_basic.php | 13 +++++++------ .../classes/override_permissions_table_advanced.php | 10 ++++++---- admin/roles/classes/view_role_definition_table.php | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/admin/roles/classes/capability_table_with_risks.php b/admin/roles/classes/capability_table_with_risks.php index b0480b098a1..acf7257e68e 100644 --- a/admin/roles/classes/capability_table_with_risks.php +++ b/admin/roles/classes/capability_table_with_risks.php @@ -163,9 +163,8 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit protected abstract function add_permission_cells($capability); protected function add_row_cells($capability) { - $this->add_permission_cells($capability); + $cells = $this->add_permission_cells($capability); // One cell for each possible risk. - $cells = ''; foreach ($this->allrisks as $riskname => $risk) { $cells .= ''; if ($risk & (int)$capability->riskbitmask) { diff --git a/admin/roles/classes/define_role_table_advanced.php b/admin/roles/classes/define_role_table_advanced.php index 8b4cc51de4a..06f565d59a5 100644 --- a/admin/roles/classes/define_role_table_advanced.php +++ b/admin/roles/classes/define_role_table_advanced.php @@ -628,6 +628,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi protected function add_permission_cells($capability) { // One cell for each possible permission. + $content = ''; foreach ($this->displaypermissions as $perm => $permname) { $strperm = $this->strperms[$permname]; $extraclass = ''; @@ -638,11 +639,12 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi if ($this->permissions[$capability->name] == $perm) { $checked = 'checked="checked" '; } - echo ''; - echo ''; } + return $content; } } diff --git a/admin/roles/classes/define_role_table_basic.php b/admin/roles/classes/define_role_table_basic.php index 14393e7ec7d..0c3d692d9b7 100644 --- a/admin/roles/classes/define_role_table_basic.php +++ b/admin/roles/classes/define_role_table_basic.php @@ -45,19 +45,20 @@ class core_role_define_role_table_basic extends core_role_define_role_table_adva $perm = $this->permissions[$capability->name]; $permname = $this->allpermissions[$perm]; $defaultperm = $this->allpermissions[$this->parentpermissions[$capability->name]]; - echo ''; + $content = ''; if ($perm == CAP_ALLOW || $perm == CAP_INHERIT) { $checked = ''; if ($perm == CAP_ALLOW) { $checked = 'checked="checked" '; } - echo ''; - echo '