annotate event

3 files changed, 29 insertions, 4 deletions

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 6bfe280..13304be 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,5 +1,5 @@
 class EventsController < ApplicationController
-  EVENTS_PER_PAGE = 50
+  EVENTS_PER_PAGE = 1
 
   before_filter :authenticate_user!
   before_filter :project
@@ -8,8 +8,7 @@ class EventsController < ApplicationController
   layout 'project'
 
   def index
-    page = (params[:page] || 1).to_i
-    @events = project.events.order("created_at DESC").page(page).per(EVENTS_PER_PAGE)
+    @events = project.events.order("created_at DESC").page(params[:page]).per(EVENTS_PER_PAGE)
   end
 
   private
diff --git a/app/models/event.rb b/app/models/event.rb
index 962e53d..185ebf1 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: events
+#
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  user_id     :integer
+#  is_admin    :integer
+#  description :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 class Event < ActiveRecord::Base
   belongs_to :project
 
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index e2d7608..1dfa52e 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: events
+#
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  user_id     :integer
+#  is_admin    :integer
+#  description :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 FactoryGirl.define do
   factory :event, class: Event do
     sequence :description do |n|
@@ -8,4 +21,4 @@ FactoryGirl.define do
       is_admin true
     end
   end
-end
\ No newline at end of file
+end