diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 1ec17e2cf..2e28c793e 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -333,7 +333,7 @@ class CoursesController < ApplicationController case params[:role] when '1' @subPage_title = l :label_teacher_list - @members = searchTeacherAndAssistant(@course) + @members = @teachers when '2' @subPage_title = l :label_student_list @members = student_homework_score @@ -882,7 +882,6 @@ class CoursesController < ApplicationController def student_homework_score teachers = find_course_teachers(@course) - homework_scores = Member.find_by_sql("SELECT id, user_id,course_id, course_group_id,created_on,IFNULL(SUM(CASE WHEN t_score <> 0 AND t_score IS NOT NULL THEN t_score ELSE s_score END),0) as score FROM ( SELECT members.id as id, members.user_id AS user_id, members.course_id AS course_id, members.created_on as created_on,members.course_group_id AS course_group_id, diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index a8296165f..2d6c35555 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -158,7 +158,7 @@
<%= l(:label_search_member_count) %><%= @result_count %><%= l(:label_member_people) %>
++ <%= l(:label_search_member_count) %> + <%= @result_count %> + <%= l(:label_member_people) %> +
<% end %><%= l(:label_no_data) %> diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index cc200ac5c..bc5a060db 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -29,6 +29,7 @@
<%= f.text_field :login, :size => 30 %> +
<%= f.password_field :password, :size => 30, :name => 'ignore',