Permalink
Browse files

Merge branch 'MDL-59864-master' of git://github.com/lameze/moodle

  • Loading branch information...
dmonllao committed Sep 4, 2017
2 parents c0bcec4 + 7b79249 commit f827adbd912b33cdeb44099310ce68653824f999

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -140,7 +140,9 @@ define([
body: Templates.render('core_calendar/event_summary_body', eventData),
templateContext: {
canedit: eventData.canedit,
candelete: eventData.candelete
candelete: eventData.candelete,
isactionevent: eventData.isactionevent,
url: eventData.url
}
};
@@ -32,5 +32,8 @@
{{/candelete}}
<button type="button" class="btn btn-primary" data-action="edit">{{#str}} edit {{/str}}</button>
{{/canedit}}
{{#isactionevent}}
<a href="{{url}}">{{#str}} gotoactivity, core_calendar {{/str}}</a>
{{/isactionevent}}
{{/footer}}
{{/ core/modal }}
@@ -124,3 +124,30 @@ Feature: Perform basic calendar functionality
| Description | Wait, this event isn't that great. |
And I press "Save"
Then I should see "Mediocre event"
@javascript
Scenario: Module events editing
Given I log in as "admin"
And I am on "Course 1" course homepage with editing mode on
And the following "activities" exist:
| activity | course | idnumber | name | intro | timeopen | timeclose |
| choice | C1 | choice1 | Test choice | Test choice description | ##today## | ##today## |
When I follow "This month"
Then I should see "Choice Test choice open"
And I should see "Choice Test choice close"
When I click on "Choice Test choice open" "link"
Then "Delete" "button" should not exist
And "Edit" "button" should not exist
And I should see "Open event"
When I click on "Go to activity" "link"
And I wait to be redirected
Then I should see "Test choice"
And I am on "Course 1" course homepage
And I follow "This month"
When I click on "Choice Test choice close" "link"
Then "Delete" "button" should not exist
And "Edit" "button" should not exist
And I should see "Close event"
When I click on "Go to activity" "link"
And I wait to be redirected
Then I should see "Test choice"
@@ -130,6 +130,7 @@
$string['global'] = 'Global';
$string['globalevent'] = 'Global event';
$string['globalevents'] = 'Global events';
$string['gotoactivity'] = 'Go to activity';
$string['gotocalendar'] = 'Go to calendar';
$string['group'] = 'Group';
$string['groupevent'] = 'Group event';

0 comments on commit f827adb

Please sign in to comment.