moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-73038' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Andrew Nicols 2021-11-15 08:54:24 +08:00
commit 7be967d3d6
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
course/format/templates/local/content/cm/title.mustache
View file

@ -36,7 +36,7 @@
<a href="{{url}}" class="aalink {{linkclasses}}" onclick="{{{onclick}}}"> <a href="{{url}}" class="aalink {{linkclasses}}" onclick="{{{onclick}}}">
<img class="iconlarge activityicon" src="{{icon}}" alt="" role="presentation" aria-hidden="true" /> <img class="iconlarge activityicon" src="{{icon}}" alt="" role="presentation" aria-hidden="true" />
<span class="instancename"> <span class="instancename">
{{instancename}} {{{altname}}} {{{instancename}}} {{{altname}}}
</span> </span>
</a> </a>
{{/uservisible}} {{/uservisible}}
@ -44,7 +44,7 @@
<div class="{{textclasses}}"> <div class="{{textclasses}}">
<img class="iconlarge activityicon" src="{{icon}}" alt="" role="presentation" aria-hidden="true" /> <img class="iconlarge activityicon" src="{{icon}}" alt="" role="presentation" aria-hidden="true" />
<span class="instancename"> <span class="instancename">
{{instancename}} {{{altname}}} {{{instancename}}} {{{altname}}}
</span> </span>
</div> </div>
{{/uservisible}} {{/uservisible}}

14
course/tests/behat/activities_edit_name.feature
View file

@ -4,8 +4,7 @@ Feature: Edit activity name in-place
As a teacher As a teacher
I need to use inplace editing I need to use inplace editing
@javascript Background:
Scenario: Edit activity name in-place
Given the following "users" exist: Given the following "users" exist:
| username | firstname | lastname | email | | username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com | | teacher1 | Teacher | 1 | teacher1@example.com |
@ -21,6 +20,9 @@ Feature: Edit activity name in-place
| name | Test forum name | | name | Test forum name |
| description | Test forum description | | description | Test forum description |
| idnumber | forum1 | | idnumber | forum1 |
@javascript
Scenario: Edit activity name in-place
When I log in as "teacher1" When I log in as "teacher1"
And I am on "Course 1" course homepage with editing mode on And I am on "Course 1" course homepage with editing mode on
# Rename activity # Rename activity
@ -41,3 +43,11 @@ Feature: Edit activity name in-place
And I am on "Course 1" course homepage And I am on "Course 1" course homepage
And I should see "Good news" And I should see "Good news"
And I should not see "Terrible news" And I should not see "Terrible news"
@javascript
Scenario: Edit activity name in-place ensuring correct encoding
When I log in as "teacher1"
And I am on "Course 1" course homepage with editing mode on
And I set the field "Edit title" in the "Test forum name" "activity" to "Good & bad news"
Then I should not see "Test forum name" in the ".course-content" "css_element"
And I should see "Good & bad news" in the ".course-content" "css_element"