From 3254cc86e8c1071b1c085f598a44d0907595078b Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 19 Oct 2014 21:04:38 +0200 Subject: [PATCH] sort & paginate nlinks @ gremium --- app/controllers/gremien_controller.rb | 2 +- app/models/nlink.rb | 2 +- app/views/gremien/show.html.erb | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 6ef948b..3a8232c 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -34,7 +34,7 @@ class GremienController < ApplicationController @gremium = Gremium.find(params[:id]) @gremientabs=Gremium.tabs @memberships=@gremium.memberships.visible_in_gremium - + @nlinks = @gremium.nlinks.page(params[:page]).per(5) respond_to do |format| format.html # show.html.erb format.json { render json: @gremium } diff --git a/app/models/nlink.rb b/app/models/nlink.rb index 106ea0d..818d225 100644 --- a/app/models/nlink.rb +++ b/app/models/nlink.rb @@ -5,6 +5,6 @@ class Nlink < ActiveRecord::Base validates :neuigkeit, :presence=>true validates :link, :presence=>true validates :link_id, :uniqueness=>{:scope=>[:neuigkeit_id,:link_type]} - + default_scope includes(:neuigkeit).order("neuigkeiten.datum").reverse_order end diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb index 1320537..3fca709 100644 --- a/app/views/gremien/show.html.erb +++ b/app/views/gremien/show.html.erb @@ -41,10 +41,12 @@
    - <% @gremium.nlinks.each do |l| %> + <% @nlinks.each do |l| %>
  • <%= render l.neuigkeit if can? :show, l.neuigkeit %>
  • <% end %>
+ <%= paginate @nlinks, theme:'twitter-bootstrap' %> +