Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'MDL-58702-master' of git://github.com/zig-moodle/moodle
- Loading branch information
Showing
with
21 additions
and
1 deletion.
-
+20
−1
backup/util/ui/restore_ui_stage.class.php
-
+1
−0
lang/en/backup.php
|
@@ -1061,7 +1061,26 @@ public function display(core_backup_renderer $renderer) { |
|
|
if (!empty($info->role_mappings->mappings)) { |
|
|
$context = context_course::instance($this->ui->get_controller()->get_courseid()); |
|
|
$assignableroles = get_assignable_roles($context, ROLENAME_ALIAS, false); |
|
|
$html .= $renderer->role_mappings($info->role_mappings->mappings, $assignableroles); |
|
|
|
|
|
// Get current role mappings. |
|
|
$currentroles = role_fix_names(get_all_roles(), $context); |
|
|
// Get backup role mappings. |
|
|
$rolemappings = $info->role_mappings->mappings; |
|
|
|
|
|
array_map(function($rolemapping) use ($currentroles) { |
|
|
foreach ($currentroles as $role) { |
|
|
// Find matching archetype to determine the backup's shortname for label display. |
|
|
if ($rolemapping->archetype == $role->archetype) { |
|
|
$rolemapping->name = $rolemapping->shortname; |
|
|
break; |
|
|
} |
|
|
} |
|
|
if ($rolemapping->name == null) { |
|
|
$rolemapping->name = get_string('undefinedrolemapping', 'backup', $rolemapping->archetype); |
|
|
} |
|
|
}, $rolemappings); |
|
|
|
|
|
$html .= $renderer->role_mappings($rolemappings, $assignableroles); |
|
|
} |
|
|
break; |
|
|
default: |
|
|
|
@@ -326,6 +326,7 @@ |
|
|
$string['title'] = 'Title'; |
|
|
$string['totalcategorysearchresults'] = 'Total categories: {$a}'; |
|
|
$string['totalcoursesearchresults'] = 'Total courses: {$a}'; |
|
|
$string['undefinedrolemapping'] = 'Role mapping undefined for: \'{$a}\' archetype'; |
|
|
$string['unnamedsection'] = 'Unnamed section'; |
|
|
$string['userinfo'] = 'Userinfo'; |
|
|
$string['module'] = 'Module'; |
|
|