Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Place Holder for preparing a Moodle_404_Stable Update #366

Merged
merged 5 commits into from
Jun 6, 2024
Merged

WIP - Place Holder for preparing a Moodle_404_Stable Update #366

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dda3992
Minor Style changes an changing the ci branch to test against main
NinaHerrmann Mar 19, 2024
116bc0a
removed unused variables to trigger a new ci
NinaHerrmann Mar 19, 2024
a80bd9f
Adjust behat feature for moodle 4.4
justusdieckmann Jun 2, 2024
f5a0e9c
Fix behat errors for moodle 4.4
justusdieckmann Jun 4, 2024
6aeaabe
Update moodle-ci.yml
NinaHerrmann Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/moodle-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: [ push, pull_request ]

jobs:
call-moodle-ci-workflow:
uses: Opencast-Moodle/moodle-workflows-opencast/.github/workflows/moodle-ci.yml@master
uses: Opencast-Moodle/moodle-workflows-opencast/.github/workflows/moodle-ci.yml@update/m404
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can undo that master is up to date

with:
requires-tool-plugin: true
requires-mod-plugin: true
Expand Down
8 changes: 4 additions & 4 deletions batchupload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

$customdata = [
'courseid' => $courseid, 'metadata_catalog' => $batchmetadatacatalog,
'eventdefaults' => $usereventdefaults, 'ocinstanceid' => $ocinstanceid
'eventdefaults' => $usereventdefaults, 'ocinstanceid' => $ocinstanceid,
];
if ($series) {
$customdata['series'] = $series;
Expand Down Expand Up @@ -257,13 +257,13 @@
}

$newfileitemid = file_get_unused_draft_itemid();
$newfilerecord = array(
$newfilerecord = [
'contextid' => $uploadedfile->get_contextid(),
'component' => $uploadedfile->get_component(),
'filearea' => $uploadedfile->get_filearea(),
'itemid' => $newfileitemid,
'timemodified' => time()
);
'timemodified' => time(),
];
$newfile = $fs->create_file_from_storedfile($newfilerecord, $uploadedfile);
// Delete the old job.
file_deletionmanager::fulldelete_file($uploadedfile);
Expand Down
2 changes: 1 addition & 1 deletion block_opencast.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public function get_content_for_output($output) {
'id' => $COURSE->id,
'bui_deleteid' => $this->instance->id,
'bui_confirm' => 1,
'sesskey' => sesskey()
'sesskey' => sesskey(),
]);
$this->page->requires->js_call_amd('block_opencast/block_delete_handler', 'init',
[$this->context->id, $deleteurl->out(false)]);
Expand Down
3 changes: 0 additions & 3 deletions classes/local/addtranscription_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ public function definition() {
// Get the renderer to use its methods.
$this->renderer = $PAGE->get_renderer('block_opencast');
$ocinstanceid = $this->_customdata['ocinstanceid'];
$identifier = $this->_customdata['identifier'];
$courseid = $this->_customdata['courseid'];

$mform = $this->_form;

$explanation = html_writer::tag('p', get_string('addnewtranscription_desc', 'block_opencast'));
Expand Down
4 changes: 2 additions & 2 deletions db/access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
'contextlevel' => CONTEXT_COURSE,
'archetypes' => [
'manager' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW
'editingteacher' => CAP_ALLOW,
],
],
'block/opencast:manageseriesforcourse' => [
Expand All @@ -161,7 +161,7 @@
'contextlevel' => CONTEXT_COURSE,
'archetypes' => [
'manager' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW
'editingteacher' => CAP_ALLOW,
],
],
'block/opencast:deleteevent' => [
Expand Down
3 changes: 3 additions & 0 deletions tests/behat/block_opencast_addlti.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ Feature: Add Opencast LTI series module as Teacher
Given the following config values are set as admin:
| addltisection_1 | 1 | block_opencast |
And I log in as "teacher1"
And I am on "Course 1" course homepage with editing mode on
And I edit the section "1" and I fill the form with:
| Section name | Topic 1 |
And I am on "Course 1" course homepage
And I click on "Go to overview..." "link"
And I click on "Add Opencast LTI series module to course" "link"
Expand Down
Loading