Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

.gitignore

@@ -13,3 +13,4 @@
 /Gemfile.lock
 /db/schema.rb
 /Gemfile.lock
+/lib/plugins/acts_as_versioned/test/debug.log

Gemfile

@@ -25,6 +25,16 @@ group :development do
   end
 end
 
+group :test do
+  # shoulda的版本做了改动
+  #gem "shoulda", "~> 3.3.2"
+  gem "shoulda", "> 3.3.2"
+  gem "mocha", "~> 0.13.3"
+  gem 'capybara', '~> 2.0.0'
+  gem 'nokogiri', '< 1.6.0'
+end
+
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
@@ -32,7 +42,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
+   gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end
@@ -42,6 +52,16 @@ group :ldap do
   gem "net-ldap", "~> 0.3.1"
 end
 
+
+platforms :mri, :mingw do
+  group :rmagick do
+    # RMagick 2 supports ruby 1.9
+    # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+    # different requirements for the same gem on different platforms
+    gem "rmagick", ">= 2.0.0"
+  end
+end
+
 # Optional gem for OpenID authentication
 group :openid do
   gem "ruby-openid", "~> 2.1.4", :require => "openid"
@@ -67,7 +87,7 @@ if File.exist?(database_file)
     adapters.each do |adapter|
       case adapter
       when 'mysql2'
-        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
+        gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw]
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
       when 'mysql'
         gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]

Gemfile.lock

@@ -52,6 +52,15 @@ GEM
       rails (>= 3, < 5)
     arel (3.0.2)
     builder (3.0.0)
+    capybara (2.0.3)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    childprocess (0.5.3)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -59,11 +68,11 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.1)
+    coffee-script-source (1.7.0)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     fastercsv (1.5.0)
+    ffi (1.9.3-x86-mingw32)
     hike (1.2.3)
     i18n (0.6.1)
     journey (1.0.4)
@@ -74,19 +83,15 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.2)
+    metaclass (0.0.4)
     mime-types (1.23)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
     multi_json (1.7.6)
     mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
+    nokogiri (1.5.11-x86-mingw32)
     polyglot (0.3.3)
-    pry (0.9.12.6-x86-mingw32)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      win32console (~> 1.3)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -112,16 +117,28 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
+    rmagick (2.13.2)
     ruby-openid (2.1.8)
-    sass (3.2.7)
+    rubyzip (1.1.4)
+    sass (3.2.14)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    slop (3.5.0)
+    selenium-webdriver (2.42.0)
+      childprocess (>= 0.5.0)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0.4)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.1)
+      activesupport (>= 3.0.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -133,10 +150,12 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (1.0.3)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    win32console (1.3.2-x86-mingw32)
+      json (>= 1.8.0)
+    websocket (1.0.7)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   x86-mingw32
@@ -147,19 +166,23 @@ DEPENDENCIES
   acts-as-taggable-on (= 2.4.1)
   better_errors!
   builder (= 3.0.0)
+  capybara (~> 2.0.0)
   coderay (~> 1.0.6)
   coffee-rails (~> 3.2.1)
   fastercsv (~> 1.5.0)
   i18n (~> 0.6.0)
   jquery-rails (~> 2.0.2)
-  mysql2 (~> 0.3.11)
+  mocha (~> 0.13.3)
+  mysql2 (= 0.3.11)
   net-ldap (~> 0.3.1)
-  pry
-  pry-nav
+  nokogiri (< 1.6.0)
   rack-mini-profiler!
   rack-openid
   rails (= 3.2.13)
+  rmagick (>= 2.0.0)
   ruby-openid (~> 2.1.4)
   sass-rails (~> 3.2.3)
   seems_rateable!
+  shoulda (> 3.3.2)
+  therubyracer
   uglifier (>= 1.0.3)

app/assets/javascripts/applied_project.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/attachment_type_edit.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/applied_project.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

app/assets/stylesheets/attachment_type_edit.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

app/controllers/account_controller.rb

@@ -143,15 +143,18 @@ class AccountController < ApplicationController
         end
        
        #added by bai
-        unless @user.id.nil?
-          ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => params[:no])
-          unless params[:province].nil? || params[:city].nil?
-            ue.location = params[:province]
-            ue.location_city = params[:city]
-            ue.save
-          end
+        if @user.id != nil
+          ue = @user.user_extensions ||= UserExtensions.new
+          #ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => )
+          ue.identity = params[:identity].to_i
+          ue.technical_title = params[:technical_title]
+          ue.gender = params[:gender].to_i
+          ue.user_id = @user.id
+          ue.student_id = params[:no]
+          ue.location = params[:province] if params[:province] != nil
+          ue.location_city = params[:city] if params[:city] != nil
+          ue.save
         end
-       #end
         
       end
     end

app/controllers/application_controller.rb

@@ -233,7 +233,15 @@ class ApplicationController < ActionController::Base
 
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action], global = false)
-    allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+    #modify by NWB
+    if  @project
+      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+    elsif @course
+      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
+    else
+      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+    end
+
     if allowed
       true
     else
@@ -245,6 +253,24 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authorize_course(ctrl = params[:controller], action = params[:action], global = false)
+    allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @course, :global => global)
+    if allowed
+      true
+    else
+      if @course && @course.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    end
+  end
+
+  def authorize_course_global(ctrl = params[:controller], action = params[:action], global = true)
+    authorize_course(ctrl, action, global)
+  end
+
+
   # Authorize the user for the requested action outside a project
   def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
     authorize(ctrl, action, global)
@@ -259,9 +285,13 @@ class ApplicationController < ActionController::Base
 
   # Find project of id params[:project_id]
   def find_project_by_project_id
-    @project = Project.find(params[:project_id])
+    if params[:project_id]
+      @project = Project.find(params[:project_id])
+    elsif params[:course_id]
+      @course = Course.find(params[:course_id])
+    end
   rescue ActiveRecord::RecordNotFound
-    render_404
+     render_404
   end
 
   def find_contest_by_contest_id
@@ -301,6 +331,10 @@ class ApplicationController < ActionController::Base
     render_404 unless @object.present?
 
     @project = @object.project
+    if @project == nil && @object.has_attribute?('course_id')
+      @course = @object.course
+    end
+
   end
   
   def find_contest_from_association
@@ -319,6 +353,14 @@ class ApplicationController < ActionController::Base
     render_404
   end
 
+  #added by nwb
+  #»ñÈ¡¿Î³Ì
+  def find_course
+    @course= Course.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
   # def find_model_object_contest
     # model = self.class.model_object
     # if model

app/controllers/attachments_controller.rb

@@ -59,6 +59,8 @@ class AttachmentsController < ApplicationController
                                       :type => detect_content_type(@attachment),
                                       :disposition => (@attachment.image? ? 'inline' : 'attachment')
     end
+  rescue => e
+    redirect_to "http://forge.trustie.net/file_not_found.html"
   end
 
   #更新资源文件类型
@@ -124,10 +126,19 @@ class AttachmentsController < ApplicationController
     end
 
     respond_to do |format|
-      if @project.nil?
-        format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum,@attachment.container) }
+      # modify by nwb
+      if @attachment.container_type == 'Course'
+        if @course.nil?
+          format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
+        else
+          format.html { redirect_to_referer_or course_path(@course) }
+        end
       else
-        format.html { redirect_to_referer_or project_path(@project)}
+        if @project.nil?
+          format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
+        else
+          format.html { redirect_to_referer_or project_path(@project) }
+        end
       end
 
       format.js
@@ -190,9 +201,14 @@ private
   def find_project
     @attachment = Attachment.find(params[:id])
     # Show 404 if the filename in the url is wrong
+    # modify by nwb
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
-    unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication'
-      @project = @attachment.project
+    if @attachment.container_type == 'Course'
+      @course = @attachment.course
+    else
+      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication'
+        @project = @attachment.project
+      end
     end
   rescue ActiveRecord::RecordNotFound
     render_404

app/controllers/boards_controller.rb

@@ -28,17 +28,25 @@ class BoardsController < ApplicationController
   helper :watchers
 
   def index
-    @boards = @project.boards.includes(:last_message => :author).all
-    @boards = [] << @boards[0] if @boards.any?
-    if @boards.size == 1
-         @board = @boards.first
-     show and return
-    end
-    if @project.project_type == 1
-     render :layout => 'base_courses'
-    else
-     render :layout => false if request.xhr?
+    #modify by nwb
+    if @project
+      @boards = @project.boards.includes(:last_message => :author).all
+      @boards = [] << @boards[0] if @boards.any?
+      if @boards.size == 1
+        @board = @boards.first
+        show and return
+      end
+      render :layout => false if request.xhr?
+    elsif @course
+      @boards = @course.boards.includes(:last_message => :author).all
+      @boards = [] << @boards[0] if @boards.any?
+      if @boards.size == 1
+        @board = @boards.first
+        show and return
+      end
+      render :layout => 'base_courses'
     end
+
   end
 
   def show  
@@ -60,10 +68,11 @@ class BoardsController < ApplicationController
           preload(:author, {:last_reply => :author}).
           all
         @message = Message.new(:board => @board)
-        if @project.project_type ==1 
-          render :action => 'show', :layout => 'base_courses'
-        else
+        #modify by nwb
+        if @project
           render :action => 'show', :layout => !request.xhr?
+        elsif @course
+          render :action => 'show', :layout => 'base_courses'
         end
       }
       format.atom {
@@ -72,7 +81,12 @@ class BoardsController < ApplicationController
           includes(:author, :board).
           limit(Setting.feeds_limit.to_i).
           all
-        render_feed(@messages, :title => "#{@project}: #{@board}")
+        if @project
+          render_feed(@messages, :title => "#{@project}: #{@board}")
+        elsif @course
+          render_feed(@messages, :title => "#{@course}: #{@board}")
+        end
+
       }
     end
   end

app/controllers/contests_controller.rb

@@ -74,6 +74,25 @@ class ContestsController < ApplicationController
     end
   end
 
+  def homework
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @bids = @course.homeworks.order('deadline DESC')
+    @bids = @bids.like(params[:name]) if params[:name].present?
+    @bid_count = @bids.count
+    @bid_pages = Paginator.new @bid_count, @limit, params['page']
+
+    @offset ||= @bid_pages.reverse_offset
+    unless @offset == 0
+      @bids = @bids.offset(@offset).limit(@limit).all.reverse
+    else
+      limit = @bid_count % @limit
+      @bids = @bids.offset(@offset).limit(limit).all.reverse
+    end
+    render :layout => 'base_courses'
+
+  end
+
+
   def show_contest
     @user = @contest.author
     @jours = @contest.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')

app/controllers/files_controller.rb

@@ -32,14 +32,16 @@ class FilesController < ApplicationController
                   'filename' => "#{Attachment.table_name}.filename",
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"
-   
-    @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]     #modify by Long Jun
-    @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
-   
-    if @project.project_type == 1
+
+    if params[:project_id]
+      @isproject = true
+      @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
+      @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+      render :layout => !request.xhr?
+    elsif params[:course_id]
+      @isproject = false
+      @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@course.id)]
       render :layout => 'base_courses'
-    else
-      render :layout => !request.xhr? 
     end
   end
 
@@ -60,37 +62,66 @@ class FilesController < ApplicationController
       respond_to do |format|
        format.js
      end
-    else
-      @addTag=false
-      container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-      attachments = Attachment.attach_filesex(container, params[:attachments],params[:attachment_type])
-      render_attachment_warning_if_needed(container)
-
-      if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-        Mailer.attachments_added(attachments[:files]).deliver
-      end
-
-      # TODO: 临时用 nyan
-      sort_init 'created_on', 'desc'
-      sort_update   'created_on' => "#{Attachment.table_name}.created_on",
-                    'filename' => "#{Attachment.table_name}.filename",
-                    'size' => "#{Attachment.table_name}.filesize",
-                    'downloads' => "#{Attachment.table_name}.downloads"
-
-      @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]     #modify by Long Jun
-      @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
-
-      @attachtype = 0
-      @contenttype = 0
-
-      respond_to do |format|
-        format.js
-        format.html   {
-          redirect_to project_files_path(@project)
-        }
-      end
+   else
+     #modify by nwb
+     if @project
+       @addTag=false
+       container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
+       attachments = Attachment.attach_filesex(container, params[:attachments], params[:attachment_type])
+       render_attachment_warning_if_needed(container)
+
+       if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+         Mailer.attachments_added(attachments[:files]).deliver
+       end
+
+       # TODO: 临时用 nyan
+       sort_init 'created_on', 'desc'
+       sort_update 'created_on' => "#{Attachment.table_name}.created_on",
+                   'filename' => "#{Attachment.table_name}.filename",
+                   'size' => "#{Attachment.table_name}.filesize",
+                   'downloads' => "#{Attachment.table_name}.downloads"
+
+       @containers = [Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)] #modify by Long Jun
+       @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+
+       @attachtype = 0
+       @contenttype = 0
+
+       respond_to do |format|
+         format.js
+         format.html {
+           redirect_to project_files_path(@project)
+         }
+       end
+     elsif @course
+       @addTag=false
+       attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type])
+
+       if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+         Mailer.attachments_added(attachments[:files]).deliver
+       end
+
+       # TODO: 临时用 nyan
+       sort_init 'created_on', 'desc'
+       sort_update 'created_on' => "#{Attachment.table_name}.created_on",
+                   'filename' => "#{Attachment.table_name}.filename",
+                   'size' => "#{Attachment.table_name}.filesize",
+                   'downloads' => "#{Attachment.table_name}.downloads"
+
+       @containers = [Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@course.id)]
+
+       @attachtype = 0
+       @contenttype = 0
+
+       respond_to do |format|
+         format.js
+         format.html {
+           redirect_to course_files_path(@course)
+         }
+       end
+     end
 
-    end
+   end
   end
 
   def tag_saveEx
@@ -115,6 +146,8 @@ class FilesController < ApplicationController
         @obj = Contest.find_by_id(@obj_id)
       when '8'
         @obj = OpenSourceProject.find_by_id(@obj_id)
+      when '9'
+        @obj = Course.find_by_id(@obj_id)
       else
         @obj = nil
     end
@@ -131,16 +164,21 @@ class FilesController < ApplicationController
    end
 
   # 返回制定资源类型的资源列表
+  # added by nwb
   def getattachtype
     sort_init 'created_on', 'desc' 
     sort_update   'created_on' => "#{Attachment.table_name}.created_on", 
                   'filename' => "#{Attachment.table_name}.filename",
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"
-   
-    @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]     #modify by Long Jun
-    @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
-   
+
+   if @project
+     @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
+     @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+    elsif @course
+     @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@course.id)]
+   end
+
     @attachtype = params[:type].to_i
     @contenttype = params[:contentType].to_s
 

app/controllers/homework_attach_controller.rb

@@ -1,21 +1,22 @@
 class HomeworkAttachController < ApplicationController
+  include CoursesHelper
   ###############################
   #判断当前角色权限时需先找到当前操作的project
-  before_filter :find_project_by_bid_id, :only => [:new]
-  before_filter :find_project_by_hoemwork_id, :only => [:edit,:update,:destroy,:show,:add_homework_users,:destory_homework_users]
+  before_filter :find_course_by_bid_id, :only => [:new]
+  before_filter :find_course_by_hoemwork_id, :only => [:edit,:update,:destroy,:show,:add_homework_users,:destory_homework_users]
   #判断当前角色是否有操作权限
   #勿删 before_filter :authorize, :only => [:new,:edit,:update,:destroy]
 
-  def find_project_by_bid_id
+  def find_course_by_bid_id
     @bid = Bid.find(params[:id])
-    @project = @bid.courses[0]
+    @course = @bid.courses[0]
   rescue ActiveRecord::RecordNotFound
     render_404
   end
 
-  def find_project_by_hoemwork_id
+  def find_course_by_hoemwork_id
     @homework = HomeworkAttach.find(params[:id])
-    @project = @homework.bid.courses[0]
+    @course = @homework.bid.courses[0]
   end
 
   #获取作业的成员
@@ -35,7 +36,7 @@ class HomeworkAttachController < ApplicationController
 
   #作业添加成员（参与人员）
   def add_homework_users
-    if User.current.admin? ||  User.current.member_of?(@homework.bid.courses.first)
+    if User.current.admin? ||  User.current.member_of_course?(@homework.bid.courses.first)
       #@homework = HomeworkAttach.find(params[:id])
       if params[:membership]
         if params[:membership][:user_ids]
@@ -59,7 +60,7 @@ class HomeworkAttachController < ApplicationController
   #作业删除成员（参与人员）
   def destory_homework_users
     #@homework = HomeworkAttach.find(params[:id])
-    if User.current.admin? ||  User.current.member_of?(@homework.bid.courses.first)
+    if User.current.admin? ||  User.current.member_of_course?(@homework.bid.courses.first)
       homework_user = @homework.homework_users.where("user_id = #{params[:user_id]}").first
       homework_user.destroy
       get_homework_member @homework
@@ -73,10 +74,19 @@ class HomeworkAttachController < ApplicationController
 
   def create
     bid = Bid.find params[:bid_id]
-    if User.current.admin? || User.current.member_of?(bid.courses.first)
+    if User.current.admin? || User.current.member_of_course?(bid.courses.first)   # modify by nwb
       if bid.homeworks.where("user_id = ?",User.current).count == 0
         user_id = params[:user_id]
         bid_id = params[:bid_id]
+        if params[:homework_attach]
+          if params[:homework_attach][:project_id]
+            project_id = params[:homework_attach][:project_id]
+          else
+            project_id = 0
+          end
+        else
+          project_id = 0
+        end
         sta = 0
         name = params[:new_form][:name]
         description = params[:new_form][:description]
@@ -85,7 +95,8 @@ class HomeworkAttachController < ApplicationController
             :state => sta,
             :name => name,
             :description => description,
-            :bid_id => bid_id
+            :bid_id => bid_id,
+            :project_id => project_id
         }
 
 
@@ -97,7 +108,7 @@ class HomeworkAttachController < ApplicationController
 
         if @homework.save
           respond_to do |format|
-            format.html { redirect_to project_for_bid_path @homework.bid }
+            format.html { redirect_to course_for_bid_path @homework.bid }
             format.json { head :no_content }
           end
         else
@@ -113,7 +124,7 @@ class HomeworkAttachController < ApplicationController
 
   def new
     @bid = Bid.find(params[:id])
-    if User.current.admin? || User.current.member_of?(@bid.courses.first)
+    if User.current.admin? || User.current.member_of_course?(@bid.courses.first)      #nwb
       #该课程的学生的集合(新建不实现功能：添加成员)
       #@members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]})
 
@@ -138,7 +149,7 @@ class HomeworkAttachController < ApplicationController
   def get_homework_member_list
     @homework = HomeworkAttach.find(params[:bid_id])
     course = @homework.bid.courses.first
-    if User.current.admin? || User.current.member_of?(course)
+    if User.current.admin? || User.current.member_of_course?(course)
       get_homework_member @homework
     else
       raise "error"
@@ -163,7 +174,7 @@ class HomeworkAttachController < ApplicationController
 
   def edit
     #@homework = HomeworkAttach.find(params[:id])
-    if User.current.admin? || User.current.member_of?(@homework.bid.courses.first)
+    if User.current.admin? || User.current.member_of_course?(@homework.bid.courses.first)
       #@members = @homework.bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => [5, 10]})
       get_homework_member @homework
     else
@@ -174,17 +185,27 @@ class HomeworkAttachController < ApplicationController
   def update
     #@homework = HomeworkAttach.find(params[:id])
     course = @homework.bid.courses.first
-    if User.current.admin? || User.current.member_of?(course)
+    if User.current.admin? || User.current.member_of_course?(course)
       name = params[:homework_name]
       description = params[:homework_description]
+      if params[:homework_attach]
+        if params[:homework_attach][:project_id]
+          project_id = params[:homework_attach][:project_id]
+        else
+          project_id = 0
+        end
+      else
+        project_id = 0
+      end
       @homework.name = name
       @homework.description = description
+      @homework.project_id = project_id
       if params[:attachments]
         @homework.save_attachments(params[:attachments])
       end
       if @homework.save
         respond_to do |format|
-          format.html { redirect_to project_for_bid_path @homework.bid }
+          format.html { redirect_to course_for_bid_path @homework.bid }
           format.json { head :no_content }
         end
       else
@@ -196,10 +217,10 @@ class HomeworkAttachController < ApplicationController
 
   def destroy
     #@homework = HomeworkAttach.find(params[:id])
-    if User.current.admin? || User.current == @homework
+    if User.current.admin? || User.current == @homework.user
       if @homework.destroy
         respond_to do |format|
-          format.html { redirect_to project_for_bid_path @homework.bid }
+          format.html { redirect_to course_for_bid_path @homework.bid }
           format.json { head :no_content }
         end
       else
@@ -212,7 +233,7 @@ class HomeworkAttachController < ApplicationController
   #显示作业信息
   def show
     #@homework = HomeworkAttach.find(params[:id])
-    if User.current.admin? || User.current.member_of?(@homework.bid.courses.first)
+    if User.current.admin? || User.current.member_of_course?(@homework.bid.courses.first)
       # 打分统计
       stars_reates = @homework.
           rates(:quality)
@@ -237,6 +258,9 @@ class HomeworkAttachController < ApplicationController
       @offset ||= @feedback_pages.offset
       @jour = @jours[@offset, @limit]
       @comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation is not null").order("created_on DESC")
+
+      @totle_score = score_for_homework @homework
+      @teaher_score = teacher_score_for_homework @homework
     else
       render_403 :message => :notice_not_authorized
     end
@@ -268,11 +292,24 @@ class HomeworkAttachController < ApplicationController
     @offset ||= @feedback_pages.offset
     @jour = @jours[@offset, @limit]
     @comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation is not null").order("created_on DESC")
+
+    @totle_score = score_for_homework @homework
+    @teaher_score = teacher_score_for_homework @homework
     respond_to do |format|
       format.js
     end
   end
 
+  #教师综评
+  def comprehensive_evaluation_jour
+    @homework = HomeworkAttach.find(params[:jour_id])
+    @add_jour = @homework.addjours User.current.id, params[:new_form][:user_message],0,params[:is_comprehensive_evaluation]
+    respond_to do |format|
+      format.html { redirect_to homework_attach_path @homework }
+      format.json { head :no_content }
+    end
+  end
+
   #获取指定作业的平均得分
   def score
     #stars_reates = @homework.rates(:quality)

app/controllers/messages_controller.rb

@@ -49,7 +49,7 @@ class MessagesController < ApplicationController
       all
 
     @reply = Message.new(:subject => "RE: #{@message.subject}")
-    if @message.board.project.project_type ==1
+    if @course
       render :action => "show", :layout => "base_courses"#by young
     else
       render :action => "show", :layout => "base_projects"#by young
@@ -68,6 +68,9 @@ class MessagesController < ApplicationController
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
         redirect_to board_message_path(@board, @message)
+      else
+        layout_file = @project ? 'base_projects' : 'base_courses'
+        render :action => 'new', :layout => layout_file
       end
     end
   end
@@ -138,8 +141,14 @@ private
   end
 
   def find_board
-    @board = Board.find(params[:board_id], :include => :project)
-    @project = @board.project
+    #modify by nwb
+    @board = Board.find(params[:board_id])
+    if @board.project_id != -1 && @board.project_id != nil
+      @project = @board.project
+    elsif  @board.course_id
+      @course = @board.course
+    end
+
   rescue ActiveRecord::RecordNotFound
     render_404
     nil

app/controllers/my_controller.rb

@@ -61,7 +61,7 @@ class MyController < ApplicationController
         end
       end
 
-      @se = @user.user_extensions ||= UserExtensions.new
+      @se = @user.extensions 
       @se.school_id = params[:occupation] if params[:occupation]
       @se.gender = params[:gender]
       @se.location = params[:province] if params[:province] 

app/controllers/news_controller.rb

@@ -38,37 +38,62 @@ class NewsController < ApplicationController
       @limit =  10
     end
 
-    scope = @project ? @project.news.visible : News.visible
-
-    @news_count = scope.count
-    @news_pages = Paginator.new @news_count, @limit, params['page']
-    @offset ||= @news_pages.offset
-    @newss = scope.all(:include => [:author, :project],
-                                       :order => "#{News.table_name}.created_on DESC",
-                                       :offset => @offset,
-                                       :limit => @limit)  
-                                      
-    respond_to do |format|
-      format.html {
-        @news = News.new # for adding news inline
-      # huang
-     
-    if @project.project_type == 1
-      render :layout => 'base_courses'  
-      else
-        render :layout => false if request.xhr?
+    # modify by nwb
+    if params[:course_id] && @course==nil
+      @course = Course.find(params[:course_id])
+    end
+    if @project
+      scope = @project ? @project.news.visible : News.visible
+
+      @news_count = scope.count
+      @news_pages = Paginator.new @news_count, @limit, params['page']
+      @offset ||= @news_pages.offset
+      @newss = scope.all(:include => [:author, :project],
+                         :order => "#{News.table_name}.created_on DESC",
+                         :offset => @offset,
+                         :limit => @limit)
+
+      respond_to do |format|
+        format.html {
+          @news = News.new # for adding news inline
+                           # huang
+
+          render :layout => false if request.xhr?
+        }
+        format.api
+        format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
+      end
+    elsif @course
+      scope = @course ? @course.news.course_visible : News.course_visible
+
+      @news_count = scope.count
+      @news_pages = Paginator.new @news_count, @limit, params['page']
+      @offset ||= @news_pages.offset
+      @newss = scope.all(:include => [:author, :course],
+                         :order => "#{News.table_name}.created_on DESC",
+                         :offset => @offset,
+                         :limit => @limit)
+
+      respond_to do |format|
+        format.html {
+          @news = News.new
+          render :layout => 'base_courses'
+        }
+        format.api
+        format.atom { render_feed(@newss, :title => (@course ? @course.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
       end
-      }
-      format.api
-      format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
     end
-  end
+   end
 
   def show
     @comments = @news.comments
-    @comments.reverse! if User.current.wants_comments_in_reverse_order?    
-    if @project.project_type == 1
-    render :layout => 'base_courses'
+    @comments.reverse! if User.current.wants_comments_in_reverse_order?
+    #modify by nwb
+    if @news.course_id
+      @course = Course.find(@news.course_id)
+      if @course
+        render :layout => 'base_courses'
+      end
     end
   end
 
@@ -81,16 +106,31 @@ class NewsController < ApplicationController
   end
 
   def create
-    @news = News.new(:project => @project, :author => User.current)
-    @news.safe_attributes = params[:news]
-    @news.save_attachments(params[:attachments])
-    if @news.save
-      render_attachment_warning_if_needed(@news)
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to project_news_index_path(@project)
-    else
-      layout_file = (@project.project_type == 1) ? 'base_courses' : 'base_projects'
-      render :action => 'new', :layout => layout_file
+    #modify by nwb
+    if @project
+      @news = News.new(:project => @project, :author => User.current)
+      @news.safe_attributes = params[:news]
+      @news.save_attachments(params[:attachments])
+      if @news.save
+        render_attachment_warning_if_needed(@news)
+        flash[:notice] = l(:notice_successful_create)
+        redirect_to project_news_index_path(@project)
+      else
+        layout_file = @project ? 'base_projects' : 'base_courses'
+        render :action => 'new', :layout => layout_file
+      end
+    elsif @course
+      @news = News.new(:course => @course, :author => User.current)
+      @news.safe_attributes = params[:news]
+      @news.save_attachments(params[:attachments])
+      if @news.save
+        render_attachment_warning_if_needed(@news)
+        flash[:notice] = l(:notice_successful_create)
+        redirect_to course_news_index_path(@course)
+      else
+        layout_file =  'base_courses'
+        render :action => 'new', :layout => layout_file
+      end
     end
   end
 
@@ -111,7 +151,13 @@ class NewsController < ApplicationController
 
   def destroy
     @news.destroy
-    redirect_to project_news_index_path(@project)
+    # modify by nwb
+    if @project
+      redirect_to project_news_index_path(@project)
+    elsif @course
+      redirect_to course_news_index_path(@course)
+    end
+
   end
 
   private

app/controllers/praise_tread_controller.rb

@@ -9,8 +9,12 @@ class PraiseTreadController < ApplicationController
     if request.get?
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
+      @horizontal = params[:horizontal].downcase == "false" ? false:true
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
-      praise_tread_plus(@obj_type,@obj_id,1)  
+      unless @obj.author_id == User.current.id
+        praise_tread_plus(@obj_type,@obj_id,1)
+      end
+
     end
   end
 
@@ -44,8 +48,12 @@ class PraiseTreadController < ApplicationController
     if request.get?
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
+      @horizontal = params[:horizontal].downcase == "false" ? false:true
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
-      praise_tread_plus(@obj_type,@obj_id,0)   
+      unless @obj.author_id == User.current.id
+        praise_tread_plus(@obj_type,@obj_id,0)
+      end
+
     end
   end
 

app/controllers/projects_controller.rb

@@ -353,27 +353,13 @@ class ProjectsController < ApplicationController
 #gcmend
 
 
-  # added by fq
-  def new_join
-    @course = Project.find(params[:object_id])
-  end
-
   #Added by young
   def homework
     @offset, @limit = api_offset_and_limit({:limit => 10})
-    @bids = @project.homeworks.order('deadline DESC')
+    @bids = @project.homeworks.order('deadline')
     @bids = @bids.like(params[:name]) if params[:name].present?
-    @bid_count = @bids.count
-    @bid_pages = Paginator.new @bid_count, @limit, params['page']
 
-    @offset ||= @bid_pages.reverse_offset
-    #@bids = @bids.offset(@offset).limit(@limit).all.reverse
-    unless @offset == 0
-      @bids = @bids.offset(@offset).limit(@limit).all.reverse
-    else
-      limit = @bid_count % @limit
-      @bids = @bids.offset(@offset).limit(limit).all.reverse
-    end
+    @bids = paginateHelper @bids
     render :layout => 'base_courses'
    
   end
@@ -920,11 +906,13 @@ class ProjectsController < ApplicationController
 
 # added by bai  
   def show_projects_score
-    
+    render :layout => false
   end
   
   def issue_score_index
-    
+       respond_to do |format|
+         format.js
+       end
   end
   
   def news_score_index

app/controllers/repositories_controller.rb

@@ -568,7 +568,7 @@ class RepositoriesController < ApplicationController
     project = Project.find(params[:id])
     if !User.current.member_of?(project)
       if project.hidden_repo
-        render_403
+        #render_403
       end
     end
   rescue ActiveRecord::RecordNotFound

app/controllers/tags_controller.rb

@@ -4,7 +4,8 @@ class TagsController < ApplicationController
   layout "base_tags"
   
   before_filter :require_admin,:only => :show
-  
+
+  include CoursesHelper
   include ProjectsHelper
   include IssuesHelper
   include UsersHelper
@@ -14,6 +15,7 @@ class TagsController < ApplicationController
   include ContestsHelper
   include ActsAsTaggableOn::TagsHelper
   helper :projects
+  helper :courses
   include TagsHelper
   helper :tags
   include OpenSourceProjectsHelper
@@ -64,6 +66,7 @@ class TagsController < ApplicationController
     # 获取搜索结果 
     @obj,@obj_pages,@results_count,@users_results,
     @projects_results,
+    @@courses_results,
     @issues_results,
     @bids_results,
     @forums_results,
@@ -96,6 +99,7 @@ class TagsController < ApplicationController
     # 获取搜索结果 
     @obj,@obj_pages,@results_count,@users_results,
     @projects_results,
+    @@courses_results,
     @issues_results,
     @bids_results,
     @forums_results,
@@ -114,6 +118,7 @@ class TagsController < ApplicationController
     # 获取搜索结果 
     @obj,@obj_pages,@results_count,@users_results,
     @projects_results,
+    @@courses_results,
     @issues_results,
     @bids_results,
     @forums_results, 
@@ -188,6 +193,7 @@ class TagsController < ApplicationController
     @obj_pages = nil
     @obj = nil
     @result = nil
+    @courses_results = nil
     
     # 这里为了提高系统的响应速度 把搜索结果放到case中去了
     case obj_flag
@@ -219,6 +225,9 @@ class TagsController < ApplicationController
     when '8'
       @obj = OpenSourceProject.find_by_id(obj_id)
       @obj_pages, @open_source_projects_results, @results_count = for_pagination(get_open_source_projects_by_tag(selected_tags))
+    when '9' then
+      @obj = Course.find_by_id(obj_id)
+      @obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags))
     else
       @obj = nil
     end
@@ -232,6 +241,7 @@ class TagsController < ApplicationController
           @forums_results, 
           attachments_results,
           @contests_results,
+          @courses_results,
           @open_source_projects_results]
   end
 
@@ -279,6 +289,8 @@ class TagsController < ApplicationController
       return 'Contest'
     when '8'
       return 'OpenSourceProject'
+    when '9'
+        return 'Course'
     else
       render_error :message => e.message
       return