Skip to content

Commit

Permalink
MDL-74716 core_my: Fix My course user tour for admins
Browse files Browse the repository at this point in the history
  • Loading branch information
ferranrecio authored and Amaia Anabitarte committed Jun 16, 2022
1 parent 2c010bb commit 31b4535
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion admin/tool/usertours/classes/manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ public static function update_shipped_tours() {
// be increased if the tour has been updated.
$shippedtours = [
'40_tour_navigation_dashboard.json' => 4,
'40_tour_navigation_mycourse.json' => 4,
'40_tour_navigation_mycourse.json' => 5,
'40_tour_navigation_course_teacher.json' => 3,
'40_tour_navigation_course_student.json' => 3,
];
Expand Down
8 changes: 8 additions & 0 deletions admin/tool/usertours/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ function xmldb_tool_usertours_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2022040602, 'tool', 'usertours');
}

if ($oldversion < 2022061600) {
// Update shipped tours.
// Normally, we just bump the version numbers because we need to call update_shipped_tours only once.
manager::update_shipped_tours();

upgrade_plugin_savepoint(true, 2022061600, 'tool', 'usertours');
}

// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
6 changes: 3 additions & 3 deletions admin/tool/usertours/tours/40_tour_navigation_mycourse.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
"enabled": "1",
"sortorder": "1",
"endtourlabel": "tour_navigation_mycourses_endtourlabel,tool_usertours",
"configdata": "{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[],\"theme\":[\"boost\"],\"cssselector\":[]},\"majorupdatetime\":1641972468,\"shipped_tour\":true,\"shipped_filename\":\"40_tour_navigation_mycourse.json\",\"shipped_version\":1}",
"configdata": "{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[],\"theme\":[\"boost\"],\"cssselector\":[]},\"majorupdatetime\":1641972468,\"shipped_tour\":true,\"shipped_filename\":\"40_tour_navigation_mycourse.json\",\"shipped_version\":5}",
"displaystepnumbers": true,
"version": "2021101301",
"version": "2022061600",
"steps": [
{
"title": "tour_navigation_mycourses_title,tool_usertours",
"content": "tour_navigation_mycourses_content,tool_usertours",
"contentformat": "1",
"targettype": "0",
"targetvalue": ".header-actions-container .btn-group",
"targetvalue": ".header-actions-container .btn-group.course-manage",
"sortorder": "0",
"configdata": "{}"
}
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/usertours/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2022041900; // The current module version (Date: YYYYMMDDXX).
$plugin->version = 2022061600; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2022041200; // Requires this Moodle version.
$plugin->component = 'tool_usertours'; // Full name of the plugin (used for diagnostics).
2 changes: 1 addition & 1 deletion my/templates/dropdown.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"courserequesturl": "https://moodle.test/course/request.php?categoryid=1"
}
}}
<div class="btn-group">
<div class="btn-group{{#manageurl}} course-manage{{/manageurl}}{{#courserequesturl}} course-request{{/courserequesturl}}">
<!-- Set as a link to appease Goutte behat. -->
<a href="#" class="btn btn-link btn-icon icon-size-3 rounded-circle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{#str}}coursemanagementoptions, my{{/str}}">
<i class="fa fa-ellipsis-v text-dark py-2" aria-hidden="true"></i>
Expand Down

0 comments on commit 31b4535

Please sign in to comment.