|  |  |  | @ -54,12 +54,12 @@ class CoursesController < ApplicationController | 
			
		
	
		
			
				
					|  |  |  |  |       #                        u.login), s.name from courses c, users u, user_extensions ue, schools s where c.is_delete=0 and | 
			
		
	
		
			
				
					|  |  |  |  |       #                        c.tea_id=u.id and u.id=ue.user_id and ue.school_id=s.id") | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |       # @courses = Course.where(is_delete: 0, is_hidden: 0).includes([teacher: :user_extension], :school) | 
			
		
	
		
			
				
					|  |  |  |  |       @courses = Course.where(is_delete: 0, is_hidden: 0).includes(:course_modules, :course_members, teacher: [user_extension: :school]) | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |       @courses = Course.where(is_delete: 0, is_hidden: 0).select("courses.id, courses.tea_id, courses.name, courses.exercises_count, courses.polls_count, | 
			
		
	
		
			
				
					|  |  |  |  |                        courses.is_public, courses.is_end, courses.visits, courses.course_members_count,courses.homework_commons_count,(SELECT MAX(created_at) | 
			
		
	
		
			
				
					|  |  |  |  |                        FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a") | 
			
		
	
		
			
				
					|  |  |  |  |                        .order("courses.id = 1309 desc, a desc") | 
			
		
	
		
			
				
					|  |  |  |  |       # @courses = Course.where(is_delete: 0, is_hidden: 0).select("courses.id, courses.tea_id, courses.name, courses.exercises_count, courses.polls_count, | 
			
		
	
		
			
				
					|  |  |  |  |       #                  courses.is_public, courses.is_end, courses.visits, courses.course_members_count,courses.homework_commons_count,(SELECT MAX(created_at) | 
			
		
	
		
			
				
					|  |  |  |  |       #                  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a") | 
			
		
	
		
			
				
					|  |  |  |  |       #                  .order("courses.id = 1309 desc, a desc") | 
			
		
	
		
			
				
					|  |  |  |  |     elsif @order == "mine" | 
			
		
	
		
			
				
					|  |  |  |  |       @courses = Course.joins(:course_members) | 
			
		
	
		
			
				
					|  |  |  |  |                        .where("is_delete = 0 AND is_hidden = 0 AND course_members.user_id = ?", @user.id) | 
			
		
	
	
		
			
				
					|  |  |  | @ -103,6 +103,7 @@ class CoursesController < ApplicationController | 
			
		
	
		
			
				
					|  |  |  |  |   # GET /courses/1 | 
			
		
	
		
			
				
					|  |  |  |  |   # GET /courses/1.json | 
			
		
	
		
			
				
					|  |  |  |  |   def show | 
			
		
	
		
			
				
					|  |  |  |  |     # render :json => {first_category_url: module_url(course.course_modules.where.not(module_type: "activity").where(hidden: 0).first, course)} | 
			
		
	
		
			
				
					|  |  |  |  |   end | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |   # GET /courses/new | 
			
		
	
	
		
			
				
					|  |  |  | 
 |