Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle

safatshahin · Nov 20, 2018 · 1cc37dc · 1cc37dc
2 parents 04e83dc + eb2fe63
commit 1cc37dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/blocks/timeline/tests/behat/block_timeline_pagelimit_persistence.feature b/blocks/timeline/tests/behat/block_timeline_pagelimit_persistence.feature
@@ -56,7 +56,7 @@ Feature: The timeline block allows user persistence of their page limits
     And I click on "25" "link"
     And I should see "Test feedback 2" in the "Timeline" "block"
     And I click on "25" "button" in the "Timeline" "block"
-    And I click on "5" "link" in the ".dropdown-menu.show" "css_element"
+    And I click on "5" "link" in the "[data-region='timeline'] [data-region='paging-control-limit-container'] .dropdown-menu" "css_element"
     Then I should not see "Test feedback 2" in the "Timeline" "block"
     And I reload the page
     And I should not see "Test feedback 2" in the "Timeline" "block"

diff --git a/theme/bootstrapbase/templates/block_timeline/view.mustache b/theme/bootstrapbase/templates/block_timeline/view.mustache
@@ -47,7 +47,7 @@
 }}
 <div data-region="timeline-view">
     <div class="tab-content" style="overflow: visible">
-        <div class="tab-pane {{#sorttimelinedates}}active in{{/sorttimelinedates}} fade" data-region="view-dates" id="view_dates_{{uniqid}}">
+        <div class="tab-pane {{#sorttimelinedates}}active in{{/sorttimelinedates}} fade" data-limit="{{limit}}" data-region="view-dates" id="view_dates_{{uniqid}}">
             {{> block_timeline/view-dates }}
         </div>
         <div