diff --git a/app/controllers/admin/activities_controller.rb b/app/controllers/admin/activities_controller.rb index d391a34..2c048fa 100644 --- a/app/controllers/admin/activities_controller.rb +++ b/app/controllers/admin/activities_controller.rb @@ -10,15 +10,18 @@ class Admin::ActivitiesController < OrbitMemberController def index @activities = Activity.order_by(:year => 'desc').page(params[:page]).per(10) - respond_to do |format| - format.html - format.xml { render :xml => @activities } - end + #respond_to do |format| + #format.html + #format.xml { render :xml => @activities } + #end end def new @member = MemberProfile.find_by(:uid=>params['uid']) rescue nil @activity = Activity.new + if params[:desktop] + render :layout => false + end end def create diff --git a/app/controllers/personal_activities_controller.rb b/app/controllers/personal_activities_controller.rb index 252047a..378c0ec 100644 --- a/app/controllers/personal_activities_controller.rb +++ b/app/controllers/personal_activities_controller.rb @@ -34,7 +34,8 @@ class PersonalActivitiesController < ApplicationController 'activity_end_date' => t('personal_activity.activity_end_date'), 'year' => t('personal_activity.year'), 'note' => t('personal_activity.note') - } + }, + "total_pages" => activities.total_pages } end diff --git a/app/models/activity.rb b/app/models/activity.rb index 3c5ec0e..4e740e8 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -45,8 +45,7 @@ class Activity "activity_organizer", "activity_area", "activity_start_date", - "activity_end_date", - "year" + "activity_end_date" ] fields_to_remove = [] diff --git a/lib/personal_activity/engine.rb b/lib/personal_activity/engine.rb index 5313702..ef28981 100644 --- a/lib/personal_activity/engine.rb +++ b/lib/personal_activity/engine.rb @@ -14,7 +14,7 @@ module PersonalActivity update_info 'some update_info' frontend_enabled - data_count 1..10 + data_count 1..30 icon_class_no_sidebar "icons-user" end end