}
// If any optional extra details are turned on, store in custom data
- $info->customdata = resource_get_optional_details($resource, $coursemodule);
+ $info->customdata = $resource->displayoptions;
return $info;
}
* @param cm_info $cm Course module information
*/
function resource_cm_info_view(cm_info $cm) {
- $details = $cm->customdata;
+ global $CFG;
+ require_once($CFG->dirroot . '/mod/resource/locallib.php');
+
+ $resource = (object)array('displayoptions' => $cm->customdata);
+ $details = resource_get_optional_details($resource, $cm);
if ($details) {
$cm->set_after_link(' ' . html_writer::tag('span', $details,
array('class' => 'resourcelinkdetails')));
--- /dev/null
+@mod @mod_resource
+Feature: Teacher can specify different display options for the resource
+ In order to provide more information about a file
+ As a teacher
+ I need to be able to show size, type and modified date
+
+ Background:
+ Given the following "users" exist:
+ | username | firstname | lastname | email |
+ | student1 | Student | 1 | student1@example.com |
+ | teacher1 | Teacher | 1 | teacher1@example.com |
+ And the following "courses" exist:
+ | fullname | shortname | category |
+ | Course 1 | C1 | 0 |
+ And the following "course enrolments" exist:
+ | user | course | role |
+ | teacher1 | C1 | editingteacher |
+ | student1 | C1 | student |
+ And I log in as "teacher1"
+ And I follow "Course 1"
+ And I turn editing mode on
+
+ @javascript
+ Scenario: Specifying no additional display options for a file resource
+ When I add a "File" to section "1"
+ And I set the following fields to these values:
+ | Name | Myfile |
+ | Show size | 0 |
+ | Show type | 0 |
+ | Show upload/modified date | 0 |
+ And I upload "mod/resource/tests/fixtures/samplefile.txt" file to "Select files" filemanager
+ And I press "Save and display"
+ Then ".resourcedetails" "css_element" should not exist
+ And I follow "Course 1"
+ And ".activity.resource .resourcelinkdetails" "css_element" should not exist
+ And I log out
+
+ @javascript
+ Scenario Outline: Specifying different display options for a file resource
+ When I add a "File" to section "1"
+ And I set the following fields to these values:
+ | Name | Myfile |
+ | Display | Open |
+ | Show size | <showsize> |
+ | Show type | <showtype> |
+ | Show upload/modified date | <showdate> |
+ And I upload "mod/resource/tests/fixtures/samplefile.txt" file to "Select files" filemanager
+ And I press "Save and display"
+ Then I <seesize> see "6 bytes" in the ".resourcedetails" "css_element"
+ And I <seetype> see "Text file" in the ".resourcedetails" "css_element"
+ And I <seedate> see "2015" in the ".resourcedetails" "css_element"
+ And I follow "Course 1"
+ And I <seesize> see "6 bytes" in the ".activity.resource .resourcelinkdetails" "css_element"
+ And I <seetype> see "Text file" in the ".activity.resource .resourcelinkdetails" "css_element"
+ And I <seedate> see "2015" in the ".activity.resource .resourcelinkdetails" "css_element"
+ And I log out
+
+ Examples:
+ | showsize | showtype | showdate | seesize | seetype | seedate |
+ | 1 | 0 | 0 | should | should not | should not |
+ | 0 | 1 | 0 | should not | should | should not |
+ | 0 | 0 | 1 | should not | should not | should |
+ | 1 | 1 | 0 | should | should | should not |
+ | 1 | 0 | 1 | should | should not | should |
+ | 0 | 1 | 1 | should not | should | should |
+ | 1 | 1 | 1 | should | should | should |