Calander view updated...

vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb

@@ -1,7 +1,7 @@
 class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 	include AdminHelper
 	include Panel::Calendar::BackEnd::CalsHelper
-
+	before_filter :force_order_for_user
 	def index
 		@calendars = Cal.all
 	end
@@ -237,7 +237,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 		# 	color = Cal.find(event.cal_id).color
 		# 	@events << {"id"=>event.id,"index"=>i,"start_date"=>event.start_date, "total_days" => no_of_days, "title" => event.title,"color"=>color,"show_link"=>panel_calendar_back_end_event_path(event)}
 		# end
-		events = Event.all.where(:cal_id.in=>fromcalendars).asc(:start_date).desc(:total_days)
+		events = Event.where(:cal_id.in=>fromcalendars).asc(:start_date).desc(:total_days)
 		events.each_with_index do |event,i|
 			# @temp = Array.new
 			startdt = Date.new(event.start_year,event.start_month)
@@ -290,8 +290,9 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 	def get_week_events
 		week = params[:week].to_i
 		year = params[:year].to_i
+		fromcalendars = params[:calendars]
 		@d = getWeekDataSet(week,year)
-		events = Event.where(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).and(:start_year => year).asc(:start_week).asc(:start_date)
+		events = Event.where(:cal_id.in=>fromcalendars).and(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).and(:start_year => year).asc(:start_week).asc(:start_date)
 		@events = Array.new
 		events.each_with_index do |event,i|
 			# @temp = Array.new
@@ -346,6 +347,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 		day = params[:date].to_i
 		month = params[:month].to_i
 		year = params[:year].to_i
+		fromcalendars = params[:calendars]
 		dt =  Date.new(year,month,day)
 		week = dt.strftime("%U")
 		events = Event.where(:start_month.lte => month).and(:start_year => year).and(:end_month.gte => month)

vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/tags_controller.rb

@@ -0,0 +1,6 @@
+class Panel::Calendar::BackEnd::TagsController < Admin::TagsController  
+	def initialize
+	    super
+	    @app_title = 'calendar'
+	end
+end

vendor/built_in_modules/calendar/config/routes.rb

@@ -13,7 +13,7 @@ Rails.application.routes.draw do
 
 	      	resources :cals 
 	      	resources :events
-
+			resources :tags
 	      end
 	  end
 	end