L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-71284 assign: prevent double escaping assignment name.

Browse Source
This commit is contained in:
Luca Bösch
2021-05-27 20:30:49 +02:00
parent 2d82188d89
commit a62fc597a7
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/classes/output/grading_app.php
+2 -2
View File
@@ -91,7 +91,7 @@ class grading_app implements templatable, renderable {
$export->cmid = $this->assignment->get_course_module()->id;
$export->contextid = $this->assignment->get_context()->id;
$export->groupid = $this->groupid;
$export->name = $this->assignment->get_context()->get_context_name();
$export->name = $this->assignment->get_context()->get_context_name(true, false, false);
$export->courseid = $this->assignment->get_course()->id;
$export->participants = array();
$export->filters = $this->assignment->get_filters();
@@ -137,7 +137,7 @@ class grading_app implements templatable, renderable {
$time = time();
$export->count = count($export->participants);
$export->coursename = $this->assignment->get_course_context()->get_context_name();
$export->coursename = $this->assignment->get_course_context()->get_context_name(true, false, false);
$export->caneditsettings = has_capability('mod/assign:addinstance', $this->assignment->get_context());
$export->duedate = $this->assignment->get_instance()->duedate;
$export->duedatestr = userdate($this->assignment->get_instance()->duedate);
mod/assign/templates/grading_navigation.mustache
+1 -1
View File
@@ -43,7 +43,7 @@
{{!
Row 1) course name & link.
}}
<a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/>
<a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{coursename}}">{{coursename}}</a><br/>
{{!
Row 2) Assignment name & link, & edit settings.
mod/assign/tests/behat/grading_app_filters.feature
+14 -11
View File
@@ -6,8 +6,8 @@ Feature: In an assignment, teachers can change filters in the grading app
Background:
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
| fullname | shortname | category | groupmode |
| Course 1 & | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
@@ -25,7 +25,7 @@ Feature: In an assignment, teachers can change filters in the grading app
And the following "activity" exists:
| activity | assign |
| course | C1 |
| name | Test assignment name |
| name | Test assignment name & |
| idnumber | assign |
| description | Submit your online text |
| assignsubmission_onlinetext_enabled | 1 |
@@ -36,10 +36,13 @@ Feature: In an assignment, teachers can change filters in the grading app
@javascript
Scenario: Set filters in the grading table and see them in the grading app
Given I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And I am on "Course 1 &" course homepage
And I follow "Test assignment name &"
And I navigate to "View all submissions" in current page administration
And I click on "Grade" "link" in the "Student 1" "table_row"
And I should not see "Course 1 &amp;"
And the "title" attribute of "a[title='Course: Course 1 &']" "css_element" should not contain "&amp;"
And I should not see "Test assignment name &amp;"
And I set the field "allocatedmarker" to "Marker 1"
And I set the field "workflowstate" to "In marking"
And I set the field "Notify students" to "0"
@@ -47,8 +50,8 @@ Feature: In an assignment, teachers can change filters in the grading app
And I click on "Edit settings" "link"
And I log out
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And I am on "Course 1 &" course homepage
And I follow "Test assignment name &"
And I navigate to "View all submissions" in current page administration
And I set the field "filter" to "Not submitted"
And I set the field "markerfilter" to "Marker 1"
@@ -61,8 +64,8 @@ Feature: In an assignment, teachers can change filters in the grading app
@javascript
Scenario: Set filters in the grading app and see them in the grading table
Given I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And I am on "Course 1 &" course homepage
And I follow "Test assignment name &"
And I navigate to "View all submissions" in current page administration
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "allocatedmarker" to "Marker 1"
@@ -72,8 +75,8 @@ Feature: In an assignment, teachers can change filters in the grading app
And I click on "Edit settings" "link"
And I log out
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And I am on "Course 1 &" course homepage
And I follow "Test assignment name &"
And I navigate to "View all submissions" in current page administration
And I click on "Grade" "link" in the "Student 1" "table_row"
And I click on "[data-region=user-filters]" "css_element"