Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

10 years ago · ff9ac244b7
parent 3697d74d48 57cfe49602
commit ff9ac244b7
2 changed files with 2 additions and 0 deletions
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -55,6 +55,7 @@ class IssuesController < ApplicationController
  helper :timelog
  include Redmine::Export::PDF
  helper :project_score
  include ApplicationHelper
  def index
    retrieve_query
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -1,6 +1,7 @@
 class StudentWorkController < ApplicationController
  layout "base_courses"
  include StudentWorkHelper
  include ApplicationHelper
  require 'bigdecimal'
  require "base64"
  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]