Commit 8e8fddc28176a48bef14812162a4b29c1fddb92c
1 parent
93403758
Exists in
new_video_plugin
Changes for rails4
Showing
2 changed files
with
2 additions
and
3 deletions
Show diff stats
plugins/video/lib/video_plugin/video_gallery_helper.rb
| @@ -5,10 +5,9 @@ module VideoPlugin::VideoGalleryHelper | @@ -5,10 +5,9 @@ module VideoPlugin::VideoGalleryHelper | ||
| 5 | configure[:list_type] ||= :folder | 5 | configure[:list_type] ||= :folder |
| 6 | if !configure[:contents].blank? | 6 | if !configure[:contents].blank? |
| 7 | configure[:contents] = configure[:contents].paginate( | 7 | configure[:contents] = configure[:contents].paginate( |
| 8 | - :order => "updated_at DESC", | ||
| 9 | :per_page => 17, | 8 | :per_page => 17, |
| 10 | :page => params[:npage] | 9 | :page => params[:npage] |
| 11 | - ) | 10 | + ).order("updated_at DESC") |
| 12 | render :file => 'shared/video_list', :locals => configure | 11 | render :file => 'shared/video_list', :locals => configure |
| 13 | else | 12 | else |
| 14 | content_tag('em', _('(empty folder)')) | 13 | content_tag('em', _('(empty folder)')) |
plugins/video/views/content_viewer/video_plugin/_video_gallery.html.erb
| @@ -11,4 +11,4 @@ | @@ -11,4 +11,4 @@ | ||
| 11 | <em><%= _('(empty video gallery)') %></em> | 11 | <em><%= _('(empty video gallery)') %></em> |
| 12 | <% else %> | 12 | <% else %> |
| 13 | <%= list_videos(:contents=>video_gallery.children) %> | 13 | <%= list_videos(:contents=>video_gallery.children) %> |
| 14 | -<% end %> | ||
| 15 | \ No newline at end of file | 14 | \ No newline at end of file |
| 15 | +<% end %> |