mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 08:55:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-77941-master' of https://github.com/aanabit/moodle

Browse Source
This commit is contained in:
Paul Holden 2023-04-18 16:57:40 +01:00
commit 7343c65bea
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blocks/myoverview/classes/output/main.php
View File

@ -555,13 +555,13 @@ class main implements renderable, templatable {
return $this->generate_zero_state_data(
$nocoursesimg,
array_reverse($buttons),
['title' => 'zero_default_title', 'intro' => 'zero_createcourses_intro']
['title' => 'zero_default_title', 'intro' => 'zero_default_intro']
);
}
return $this->generate_zero_state_data(
$nocoursesimg,
$buttons,
['title' => 'zero_default_title', 'intro' => 'zero_nomanagecourses_intro']
['title' => 'zero_default_title', 'intro' => 'zero_default_intro']
);
}
}
@ -569,7 +569,7 @@ class main implements renderable, templatable {
return $this->generate_zero_state_data(
$nocoursesimg,
[],
['title' => 'zero_default_title', 'intro' => 'zero_nopermission_intro']
['title' => 'zero_default_title', 'intro' => 'zero_default_intro']
);
}

4
blocks/myoverview/lang/en/block_myoverview.php
View File

@ -89,13 +89,11 @@ $string['sortbyshortname'] = 'Sort by short name';
$string['privacy:request:preference:set'] = 'The value of the setting \'{$a->name}\' was \'{$a->value}\'';
$string['viewquickstart'] = 'View Quickstart guide';
$string['zero_default_title'] = 'You\'re not enrolled in any course';
$string['zero_nopermission_intro'] = 'Once you enrol in a course, it will appear here.';
$string['zero_default_intro'] = 'Once you enrol in a course, it will appear here.';
$string['zero_request_title'] = 'Request your first course';
$string['zero_request_intro'] = 'Need help getting started? Check out the <a href="{$a->dochref}" title="{$a->doctitle}" target="{$a->doctarget}">Moodle documentation</a> or take your first steps with our <a href="{$a->quickhref}" title="{$a->quicktitle}" target="{$a->quicktarget}">Quickstart guide</a>.';
$string['zero_nocourses_title'] = 'Create your first course';
$string['zero_nocourses_intro'] = 'Need help getting started? Check out the <a href="{$a->dochref}" title="{$a->doctitle}" target="{$a->doctarget}">Moodle documentation</a> or take your first steps with our Quickstart guide.';
$string['zero_createcourses_intro'] = 'Once you enrol in a course, it will appear here.';
$string['zero_nomanagecourses_intro'] = 'Once you enrol in a course, it will appear here.';
// Deprecated since Moodle 4.0.
$string['clearsearch'] = "Clear search";

4
blocks/myoverview/tests/behat/block_myoverview_zerostate.feature
View File

@ -41,7 +41,7 @@ Feature: Zero state on my overview block
And I click on "Create course" "button"
And I should see "Add a new course"
Scenario: Users with permissions to create a course but is not enroled in any existing course
Scenario: Users with permissions to create a course but is not enrolled in any existing course
Given the following "course" exists:
| fullname | Course 1 |
| shortname | C1 |
@ -56,7 +56,7 @@ Feature: Zero state on my overview block
And I click on "Manage courses" "button"
And I should see "Course 1"
Scenario: Users with permissions to create but not to manage courses and is not enroled in any existing course
Scenario: Users with permissions to create but not to manage courses and is not enrolled in any existing course
Given the following "permission overrides" exist:
| capability | permission | role | contextlevel | reference |
| moodle/category:manage | Prohibit | manager | System | |