From 149d7ef1f44d1010c6870296df9ffc03f8ed7d4f Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 11 Jun 2014 11:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb |  8 +-
 app/controllers/files_controller.rb       | 89 +++++++++++++++--------
 2 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b9667f080..03b626f7d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -233,7 +233,13 @@ 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)
+    end
+
     if allowed
       true
     else
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 74a17f671..3d4d33be8 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -62,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