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

Merge branch 'MDL-80283-main' of https://github.com/lucaboesch/moodle

Browse Source
This commit is contained in:
Mihail Geshoski
2025-08-26 10:45:40 +08:00
parent 309bb2af82 791df89032
commit b021a0414f
2 changed files with 94 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/mod/url/tests/behat/display_url.feature
+83
View File
@@ -0,0 +1,83 @@
@mod @mod_url
Feature: Teacher can specify different display options for a url
In order to specify different display options for a url
As a teacher
I need to be able to set either auto, embed, open or pop-up
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| student1 | Vinnie | Student1 | student1@example.com |
| teacher1 | Darrell | Teacher1 | teacher1@example.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| student1 | C1 | student |
| teacher1 | C1 | editingteacher |
And the following config values are set as admin:
| displayoptions | 0,1,2,3,5,6 | url |
Scenario: URL resource module with download display option to an external website shows in limited width
Given the following "activity" exists:
| activity | url |
| course | C1 |
| idnumber | Music history |
| name | Music history |
| intro | URL description |
| externalurl | http://www.example.com/file.zip |
| display | 0 |
When I am on the "Music history" "url activity" page logged in as student1
Then "Music history" "link" should exist
And the "class" attribute of "body" "css_element" should contain "limitedwidth"
Scenario: URL resource module with in pop-up display option to an external website shows in a pop-up
Given the following "activity" exists:
| activity | url |
| course | C1 |
| idnumber | Music history |
| name | Music history |
| intro | URL description |
| externalurl | https://moodle.org/ |
| display | 6 |
| popupwidth | 800 |
| popupheight | 600 |
When I am on the "Music history" "url activity" page logged in as student1
Then the "class" attribute of "body" "css_element" should contain "limitedwidth"
Scenario: URL resource module with open display option to an external website shows in the same window
Given the following "activity" exists:
| activity | url |
| course | C1 |
| idnumber | Music history |
| name | Music history |
| intro | URL description |
| externalurl | https://moodle.org/ |
| display | 5 |
When I am on the "Music history" "url activity" page logged in as student1
Then the "class" attribute of "body" "css_element" should contain "limitedwidth"
Scenario: URL resource module with new window display option to an external website shows in a new window
Given the following "activity" exists:
| activity | url |
| course | C1 |
| idnumber | Music history |
| name | Music history |
| intro | URL description |
| externalurl | https://moodle.org/ |
| display | 3 |
When I am on the "Music history" "url activity" page logged in as student1
Then the "class" attribute of "body" "css_element" should contain "limitedwidth"
Scenario: URL resource module with embed display option to an external website shows in full width
Given the following "activity" exists:
| activity | url |
| course | C1 |
| idnumber | Music history |
| name | Music history |
| intro | URL description |
| externalurl | https://moodle.org/ |
| display | 1 |
When I am on the "Music history" "url activity" page logged in as student1
Then the "class" attribute of "body" "css_element" should not contain "limitedwidth"
public/mod/url/view.php
+11
View File
@@ -69,6 +69,17 @@ if ($displaytype == RESOURCELIB_DISPLAY_OPEN) {
$redirect = true;
}
$limitedwidthdisplaytypes = [
RESOURCELIB_DISPLAY_NEW,
RESOURCELIB_DISPLAY_DOWNLOAD,
RESOURCELIB_DISPLAY_OPEN,
RESOURCELIB_DISPLAY_POPUP,
];
if (in_array($displaytype, $limitedwidthdisplaytypes)) {
$PAGE->add_body_class('limitedwidth');
}
if ($redirect && !$forceview) {
// coming from course page or url index page,
// the redirection is needed for completion tracking and logging