From 64107ca5ccc9af52eafa9f2a2d66d6c8deded2da Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 19 Sep 2014 15:43:25 +0800
Subject: [PATCH 01/19] =?UTF-8?q?#1279=20=E4=B8=BB=E9=A1=B5--=E2=80=9C?=
 =?UTF-8?q?=E6=88=91=E8=A6=81=E6=8F=90=E9=97=AE=E2=80=9D/=E2=80=9C?=
 =?UTF-8?q?=E6=88=91=E8=A6=81=E5=8F=8D=E9=A6=88=E2=80=9D=20=E7=BD=AE?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=9D=A1=E4=BB=B6=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=91=E5=B8=83=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E7=BB=99=E5=87=BA=E7=B1=BB=E4=BC=BC=E4=BA=8E=E2=80=9C?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98/=E5=86=85=E5=AE=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E2=80=9D=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF,=E7=BB=99=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=90=8E=E8=B7=B3=E8=BD=AC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BF=AE=E6=AD=A3=EF=BC=8C=E5=B0=86=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E6=8C=89=E9=92=AE=E5=B9=B6=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb  |  5 ++---
 app/views/memos/_topic_form.html.erb | 12 +-----------
 app/views/memos/new.html.erb         |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index aad575ee5..9f261c78a 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -89,10 +89,9 @@ class MemosController < ApplicationController
                     offset(@reply_pages.offset).
                     all
         if @memo.new_record?
-          format.html { redirect_to back_url, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+          format.html { render :new,:layout=>'base'}
         else
-          format.html { render action: :show }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
-          # format.html { redirect_to back_memo_or_forum_url}#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+          format.html { render action: :show }
           format.json { render json: @memo.errors, status: :unprocessable_entity }
         end
 
diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb
index 3f5642733..d7d0aeca0 100644
--- a/app/views/memos/_topic_form.html.erb
+++ b/app/views/memos/_topic_form.html.erb
@@ -1,15 +1,5 @@
 <%= labelled_form_for(@memo, :url => forum_memos_path) do |f|  %>
-  <% if @memo.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@memo.errors.count, "error") %> prohibited this memo from being saved:</h2>
 
-      <ul>
-      <% @memo.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
   <div class="actions" style="max-width:680px">
     <p><%= f.text_field :subject, :required => true, :size => 95 %></p>
     <p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor01' %></p>
@@ -20,6 +10,6 @@
        <%= l(:label_attachment_plural) %><br />
        <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
      </p>
-   <%= f.submit :value => l(:label_memo_create) %>
+   <%= f.submit :value => l(:label_memo_create) %> <%= link_to l(:button_back), forum_path(@forum) %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index bcda7896d..03a60044a 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -27,5 +27,5 @@
 	<%= render :partial => 'memos/topic_form' %>
 </div>
 
-<%= link_to l(:button_back), forum_path(@forum) %>
+
 </div>

From 086d99fe2ac20d30af7478a8db792916b25255da Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 22 Sep 2014 10:35:18 +0800
Subject: [PATCH 02/19] =?UTF-8?q?#1280=20=E5=85=AC=E5=85=B1=E8=B4=B4?=
 =?UTF-8?q?=E5=90=A7--=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=AE=E6=89=80=E6=9C=89=E6=9D=A1=E4=BB=B6=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=91=E5=B8=83=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=B4=E8=BF=94=E5=9B=9E=E5=B8=96=E5=AD=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=85=B6=E4=BB=96=E7=9B=B8=E5=85=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E5=81=9C=E7=95=99=E5=9C=A8=E5=8F=91?=
 =?UTF-8?q?=E5=B8=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/show.html.erb | 3 +--
 config/locales/zh.yml          | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 4cd6631c2..642cf5b15 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,5 +1,5 @@
 <!-- added by fq -->
-<div id="add-memo" class='lz' style="display: none; padding: 20px;">
+<div id="add-memo" class='lz' style="<% unless @memo.errors.any?%>display: none;<% end %> padding: 20px;">
 	<h3><%=l(:label_memo_new)%></h3>
 	<% if User.current.logged? %>
 	<%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f|  %>
@@ -40,5 +40,4 @@
             :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %>
 </span>
 
-
 <%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 27589e5f1..56b4aad2a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1936,7 +1936,7 @@ zh:
   label_first_page_create_fail: 首页定制失败
   label_forum_edit: 编辑讨论区
   label_memo_create: 发布
-  label_memo_new: 新建主题
+  label_memo_new: 新建帖子
   label_memo_edit: 修改主题
   label_memo_new_from_forum: 发布帖子
   label_forum: 公共贴吧
@@ -2128,4 +2128,4 @@ zh:
   lable_hot_course: 活跃课程
   lable_hot_projects: 热门项目
   lable_user_active: 用户动态
-  lable_bar_active: 贴吧动态
+  lable_bar_active: 贴吧动态

From 4604720475ff18d0775c1979766e49dbde28627c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 22 Sep 2014 14:55:29 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: alan <547533434@qq.com>
---
 .../contests/_new_softapplication.html.erb    | 114 ++++++++----------
 config/locales/zh.yml                         |  13 +-
 2 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
index ebea41b43..dc5a9493c 100644
--- a/app/views/contests/_new_softapplication.html.erb
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -1,51 +1,77 @@
 <%#= error_messages_for 'softapplication'  %>
 
-<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+<script type="text/javascript" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
     //验证作品名称
     function regexName()
    {
        var name = $("#softapplication_name").val();
-       if(name.length ==0)
+       if(name.length == 0)
        {
-           $("#spane_name_notice").text("作品名称不能为空");
+           $("#spane_name_notice").text("<%= l(:label_no_softapplication_name) %>");
            $("#spane_name_notice").css('color','#ff0000');
            $("#spane_name_notice").focus();
            return false;
        }
        else if(name.length <= 25)
        {
-           $("#spane_name_notice").text("填写正确");
+           $("#spane_name_notice").text("<%= l(:label_field_correct) %>");
            $("#spane_name_notice").css('color','#008000');
            return true;
        }
        else
        {
-           $("#spane_name_notice").text("作品名称超过25个汉字");
+           $("#spane_name_notice").text("<%= l(:label_work_name_condition) %>");
            $("#spane_name_notice").css('color','#ff0000');
            $("#spane_name_notice").focus();
            return false;
        }
    }
 
+    // added by longjun
+    //验证作品简介
+    function regexDescription()
+    {
+        var name = $("#softapplication_description").val();
+        if(name.length ==0)
+        {
+            $("#span_sofapplication_description").text("<%= l(:label_no_softapplication_description) %>");
+            $("#span_sofapplication_description").css('color','#ff0000');
+            $("#span_sofapplication_description").focus();
+            return false;
+        }
+        else if(name.length <= 500)
+        {
+            $("#span_sofapplication_description").text("<%= l(:label_field_correct) %>");
+            $("#span_sofapplication_description").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#span_sofapplication_description").text("<%= l(:label_work_description_condition) %>");
+            $("#span_sofapplication_description").css('color','#ff0000');
+            $("#span_sofapplication_description").focus();
+            return false;
+        }
+    }
    //验证运行平台
    function regexWorkdescription()
    {
        var workDescription = $("#softapplication_android_min_version_available").val();
        if(workDescription.length ==0)
        {
-           $("#spane_workdescription_notice").text("运行平台不能为空");
+           $("#spane_workdescription_notice").text("<%= l(:label_no_softapplication_platform) %>");
            $("#spane_workdescription_notice").css('color','#ff0000');
            return false;
        }
        if(workDescription.length <= 125)
        {
-           $("#spane_workdescription_notice").text("填写正确");
+           $("#spane_workdescription_notice").text("<%= l(:label_field_correct) %>");
            $("#spane_workdescription_notice").css('color','#008000');
            return true;
        }
        else
        {
-           $("#spane_workdescription_notice").text("运行平台超过125个汉字");
+           $("#spane_workdescription_notice").text("<%= l(:label_work_platform_condition) %>");
            $("#spane_workdescription_notice").css('color','#ff0000');
            return false;
        }
@@ -57,19 +83,19 @@
         var workDescription = $("#softapplication_application_developers").val();
         if(workDescription.length ==0)
         {
-            $("#span_softapplication_application_developers").text(<%= l(:label_no_softapplication_developers) %>);
+            $("#span_softapplication_application_developers").text("<%= l(:label_no_softapplication_developers) %>");
             $("#span_softapplication_application_developers").css('color','#ff0000');
             return false;
         }
         if(workDescription.length <= 125)
         {
-            $("#span_softapplication_application_developers").text(<%= l(:label_field_correct) %>);
+            $("#span_softapplication_application_developers").text("<%= l(:label_field_correct) %>");
             $("#span_softapplication_application_developers").css('color','#008000');
             return true;
         }
         else
         {
-            $("#span_softapplication_application_developers").text(<%= l(:label_softapplication_developers_condition) %>);
+            $("#span_softapplication_application_developers").text("<%= l(:label_softapplication_developers_condition) %>");
             $("#span_softapplication_application_developers").css('color','#ff0000');
             return false;
         }
@@ -77,7 +103,7 @@
     //提交验证
     function submit_new_softapplication()
     {
-        if(regexName() && regexWorkdescription() && regexDevelopers())
+        if(regexName() && regexDescription() && regexDevelopers())
         {
             $("#new_softapplication").submit();
         }
@@ -90,70 +116,36 @@
       <tr style="width:700px; margin-left: -10px;">
         <span><%= l(:label_work_name) %></span>
         <span class="contest-star"> * </span>:
-        <td>
+
           <%= f.text_field :name,
                            :required => true,
                            :size => 60,
                            :style => "width:320px;",
                            :onblur => "regexName();"
           %>
-        </td>
+
         <span style="font-size: 10px;" id="spane_name_notice">(<%= l(:label_workname_lengthlimit) %>)</span>
       </tr>
       <br/>
       <br/>
       <br/>
 
-      <tr style="width:800px;">
-        <span><%= l(:label_running_platform) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px">
-          <%= f.text_field :android_min_version_available,
-                           :required => true,
-                           :size => 60,
-                           :style => "width:320px;",
-                           :onblur=>"regexWorkdescription();"
-          %>
-        </td>
-        <span style="font-size: 10px" id="spane_workdescription_notice">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
 
-      <tr style="width:800px;">
-        <span><%= l(:label_work_type) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px">
-            <span>
-              <%#= select_tag 'app_type_name', work_type_opttion, {:name => 'app_type_name',:style => "width:358px;"} %>
-            </span>
-          <%= f.select :app_type_name,work_type_opttion,
-                       {},
-                       {:style => "width:328px;",:onchange => "selectChange(this)"}  %>
-          <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
-        </td>
-          <span style="font-size: 10px;display: none" id="other_span">
-            <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;"  %>
-            <input type="text" style="width: 120px;" id="other_input" name = "other_input"/>
-          </span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
 
-      <tr style="width:800px;">
-        <td style="padding-bottom: 290px;">
+      <tr style="width:800px; padding-bottom: 30px;">
+
             <span><%= l(:label_work_description) %></span>
             <span class="contest-star"> * </span>:
-        </td>
-        <td style="width: 100px">
-          <%= f.text_field :description,
+
+            <!-- modified by longjun 将单行输入框改成多行-->
+          <%= f.text_area :description,
                            :required => true,
                            :size => 60,
-                           :style => "width:320px;"
+                           :rows => 3,
+                           :onblur => 'regexDescription();',
+                           :style => "width:320px; "
           %>
-        </td>
+        <span style="font-size: 10px;" id="span_sofapplication_description">(<%= l(:label_work_description_lengthlimit) %>)</span>
         <!--span style="font-size: 10px">(<%#= l(:label_workdescription_lengthlimit) %>)</span-->
       </tr>
       <br/>
@@ -163,14 +155,14 @@
       <tr style="width:800px;">
         <span><%= l(:label_softapplication_developers) %></span>
         <span class="contest-star"> * </span>:
-        <td style="width: 100px">
+
           <%= f.text_field :application_developers,
                            :required => true,
                            :size => 60,
                            :style => "width:320px;",
                            :onblur => 'regexDevelopers();'
           %>
-        </td>
+
         <span style="font-size: 10px" id="span_softapplication_application_developers">
           (<%= l(:label_workdescription_lengthlimit) %>)
         </span>
@@ -221,8 +213,8 @@
       </fieldset>
     </fieldset></br>
     <div class="align-center" style="padding-top: -3px; padding-bottom: 8px">
-      <!--<input type="button" class="enterprise" value="<%=l(:button_create) %>" onclick="submit_new_softapplication();" >-->
-      <%= submit_tag l(:button_create) %>
+      <input type="button" class="enterprise" value="<%=l(:button_create) %>" onclick="submit_new_softapplication();" >
+      <%#= submit_tag l(:button_create) %>
       <%= submit_tag l(:button_cancel),
                      :name => nil,
                      :onclick => "cancel();",
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 27589e5f1..58ab416c7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2000,8 +2000,15 @@ zh:
   label_work_deposit_project_url: 托管项目网址
   label_work_deposit_project: 托管项目
   label_softapplication_name_condition: 25个汉字以内（50个字符）
-  label_softapplication_description_condition: 125个汉字以内
+  label_softapplication_description_condition: 125个汉字以内,开发人员用,隔开
+  label_work_description_lengthlimit: 500个汉字以内
   label_softapplication_developers_condition: 开发人员超过125个汉字
+  label_no_softapplication_name: 作品名称不能为空
+  label_work_name_condition: 作品名称超过25个汉字
+  label_no_softapplication_description: 作品简介不能为空
+  label_work_description_condition: 作品简介名称超过500个汉字
+  label_no_softapplication_platform: 运行平台不能为空
+  label_work_platform_condition: 运行平台超过125个汉字
   label_no_softapplication_developers: 开发人员不能为空
   label_user_login_softapplication_board: 您还没有登录，请登录后参与应用评价。
   label_contest_description_no: 暂无描述。
@@ -2043,7 +2050,7 @@ zh:
   label_attending_contest: 参加竞赛
   label_new_attendingcontest_work: 新建参赛作品
   label_workname_lengthlimit: 25个汉字以内
-  label_workdescription_lengthlimit: 125个汉字以内
+  label_workdescription_lengthlimit: 125个汉字以内，用英文逗号隔开
   label_please_input_password: 请输入竞赛密码
   label_please_select_project: 请选择项目
   label_upload_softworkpacket_photo: 上传作品软件包和作品截图
@@ -2128,4 +2135,4 @@ zh:
   lable_hot_course: 活跃课程
   lable_hot_projects: 热门项目
   lable_user_active: 用户动态
-  lable_bar_active: 贴吧动态
+  lable_bar_active: 贴吧动态

From b88c361525fed3cdfaccc35d36a1b80732fa027c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 22 Sep 2014 17:32:18 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81=E6=A0=B7=E5=BC=8F=20Signed?=
 =?UTF-8?q?-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/_new_softapplication.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
index dc5a9493c..3e4c0c9e0 100644
--- a/app/views/contests/_new_softapplication.html.erb
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -134,8 +134,9 @@
 
       <tr style="width:800px; padding-bottom: 30px;">
 
-            <span><%= l(:label_work_description) %></span>
-            <span class="contest-star"> * </span>:
+            <span style="margin-top: 5px; float: left; display: block;"><%= l(:label_work_description) %>&nbsp;</span>
+            <span style="margin-top: 5px;float: left; display: block;" class="contest-star"> * </span>
+            <span style="margin-top: 5px; float: left; display: block;"> &nbsp;:&nbsp;</span>
 
             <!-- modified by longjun 将单行输入框改成多行-->
           <%= f.text_area :description,
@@ -147,6 +148,7 @@
           %>
         <span style="font-size: 10px;" id="span_sofapplication_description">(<%= l(:label_work_description_lengthlimit) %>)</span>
         <!--span style="font-size: 10px">(<%#= l(:label_workdescription_lengthlimit) %>)</span-->
+
       </tr>
       <br/>
       <br/>

From 97156f0de1909530d470465c5963d39aff7cf482 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 23 Sep 2014 14:46:19 +0800
Subject: [PATCH 05/19] =?UTF-8?q?enable=5Fmodule=E8=A1=A8=E8=A2=AB?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=96=B0=E5=BB=BA=E5=A4=B1=E8=B4=A5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C@course=E5=AF=B9=E8=B1=A1=E6=9C=AA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=95=85=E5=85=B6id=E4=B8=BAnull=EF=BC=8C=E5=8D=B4=E5=81=9A?=
 =?UTF-8?q?=E4=BA=86=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4enable=5Fmodule=E8=A1=A8=E6=97=B6sql=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=E5=B0=B1=E6=88=90=E4=BA=86DELETE=20FROM=20`enabled=5F?=
 =?UTF-8?q?modules`=20WHERE=20`enabled=5Fmodules`.`course=5Fid`=20IS=20NUL?=
 =?UTF-8?q?L=20=E8=80=8C=E8=BF=99=E5=88=9A=E5=A5=BD=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E4=BA=86=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E3=80=82=E8=A7=A3=E5=86=B3=E5=8A=9E=E6=B3=95=EF=BC=9A=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=88=A0=E9=99=A4=E8=AF=BE=E7=A8=8B=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index aa5e2c2a6..97434a0c9 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -269,7 +269,7 @@ class CoursesController < ApplicationController
           format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
         end
       else
-        @course.destroy
+        #@course.destroy
         respond_to do |format|
           format.html { render :action => 'new', :layout => 'base' } #Added by young
           format.api { render_validation_errors(@course) }

From 83c5d5c78db4efb32a95ff9786b62b84a06a0a6b Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 24 Sep 2014 09:03:38 +0800
Subject: [PATCH 06/19] =?UTF-8?q?#1283=E5=85=AC=E5=91=8A=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=E5=9B=9E=E5=B8=96=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F,?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E7=94=B1=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 5da3c5d63..2736ca81b 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -90,7 +90,8 @@
 				)if !@memo.locked? && User.current.logged? %>
 				
 			<%= link_to(
-				image_tag('edit.png'),
+				#image_tag('edit.png'),
+                l(:button_edit),
 				{:action => 'edit', :id => reply},
 				:title => l(:button_edit)
 				) if reply.editable_by?(User.current) %>

From 8d657fd0af8de6d930efe8203c69e87e820bb220 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 24 Sep 2014 14:47:53 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=201,=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E9=80=9A=E7=9F=A5=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=B9=9F=E8=83=BD=E6=88=90=E5=8A=9F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=202=EF=BC=8C=20=E2=80=9C=E5=88=A0=E9=99=A4=E2=80=9D=E4=BA=8C?=
 =?UTF-8?q?=E5=AD=97=E7=AB=96=E7=9A=84=E6=8E=92=E5=88=97=203=EF=BC=8C=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=AB=9E=E8=B5=9B=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E6=96=B0=E9=97=BB=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: alan <547533434@qq.com>
---
 app/controllers/courses_controller.rb        | 1400 +++++++++---------
 app/views/contestnotifications/edit.html.erb |    2 +-
 app/views/contestnotifications/show.html.erb |   23 +-
 config/locales/zh.yml                        |    2 +
 4 files changed, 722 insertions(+), 705 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 97434a0c9..c73a1e0fc 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1,700 +1,700 @@
-class CoursesController < ApplicationController
-  layout 'base_courses'
-  include CoursesHelper
-  helper :activities
-  helper :members
-  helper :words
-
-  menu_item :overview
-  menu_item :feedback, :only => :feedback
-  menu_item :homework, :only => :homework
-
-  menu_item l(:label_sort_by_time), :only => :index
-  menu_item l(:label_sort_by_active), :only => :index
-  menu_item l(:label_sort_by_influence), :only => :index
-
-  before_filter :can_show_course, :except => []
-  before_filter :find_course, :except => [ :index, :search,:list, :new,:join,:unjoin, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
-  before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course]
-  before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create]
-  before_filter :require_admin, :only => [:copy, :archive, :unarchive, :destroy, :calendar]
-  before_filter :toggleCourse, only: [:finishcourse, :restartcourse]
-
-  before_filter :require_login, :only => [:join, :unjoin]
-  before_filter :allow_join, :only => [:join]
-
-  def join
-    if User.current.logged?
-      course = Course.find(params[:object_id])
-      if params[:course_password] == course.password
-        members = []
-        members << Member.new(:role_ids => [10], :user_id => User.current.id)
-        course.members << members
-
-        StudentsForCourse.create(:student_id => User.current.id, :course_id => params[:object_id])
-        @state = 0
-      else
-        @state = 1
-      end
-    end
-    respond_to do |format|
-      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Course.find(params[:object_id]), :object_id => params[:object_id]} }
-    end
-  end
-
-  def unjoin
-    if User.current.logged?
-
-      @member = Member.where('course_id = ? and user_id = ?', params[:object_id], User.current.id)
-      @member.first.destroy
-
-      joined = StudentsForCourse.where('student_id = ? and course_id = ?', User.current.id, params[:object_id])
-      joined.each do |join|
-        join.delete
-      end
-    end
-    respond_to do |format|
-      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Course.find(params[:object_id]), :object_id => params[:object_id]} }
-    end
-  end
-
-  #更新课程信息
-  def update
-    @course.safe_attributes = params[:course]
-    @course.time = params[:time]
-    @course.term = params[:term]
-    @course.class_period = params[:class_period]
-    if  @course.save
-      if params[:course][:is_public] == '0'
-        course_status = CourseStatus.find_by_course_id(@course.id)
-        course_status.destroy if course_status
-      elsif params[:course][:is_public] == '1'
-        course_status = CourseStatus.find_by_course_id(@course.id)
-        course_status.destroy if course_status
-        course_status = CourseStatus.create(:course_id => @course.id,  :grade => 0)
-      end
-
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_update)
-          redirect_to settings_course_path(@course)
-        }
-        format.api  { render_api_ok }
-      end
-    else
-      respond_to do |format|
-        format.html {
-          settings
-          render :action => 'settings'
-        }
-        format.api  { render_validation_errors(@course) }
-      end
-    end
-  end
-
-  def new_join
-    @course = Course.find(params[:object_id])
-  end
-
-  # 课程搜索
-  # add by nwb
-  def search
-    courses_all = Course.all_course
-    name = params[:name]
-    (redirect_to courses_path, :notice => l(:label_sumbit_empty);return) if name.blank?
-    @courses = courses_all.visible
-    if params[:name].present?
-      @courses_all = @courses.like(params[:name])
-    else
-      @courses_all =  @courses;
-    end
-    @course_count = @courses_all.count
-    @course_pages = Paginator.new @course_count, per_page_option, params['page']
-
-    # 课程的动态数
-    @course_activity_count=Hash.new
-    @courses_all.each do |course|
-      @course_activity_count[course.id]=0
-    end
-
-    case params[:course_sort_type]
-      when '0'
-        @courses =  @courses_all.order("created_at desc")
-        @s_type = 0
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-
-      when '1'
-        @courses = @courses_all.order("course_ac_para desc")
-        @s_type = 1
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-
-      when '2'
-        @courses = @courses_all.order("watchers_count desc")
-        @s_type = 2
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-
-      when '3'
-        @course_activity_count=get_course_activity @courses_all,@course_activity_count_array
-        @courses=handle_course @courses_all,@course_activity_count
-        @s_type = 3
-        @courses =  @courses[@course_pages.offset, @course_pages.per_page]
-
-      else
-        @s_type = 0
-        @courses = @courses_all.order("created_at desc")
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-         @course_activity_count=get_course_activity @courses,@course_activity_count
-
-    end
-
-    respond_to do |format|
-      format.html {
-        render :layout => 'course_base'
-        scope = Course
-        unless params[:closed]
-          scope = scope.active
-        end
-      }
-      format.atom {
-        courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
-        render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
-      }
-    end
-  end
-
-  def member
-    ## 有角色参数的才是课程，没有的就是项目
-    @render_file = 'member_list'
-    @teachers= searchTeacherAndAssistant(@course)
-    @canShowCode = isCourseTeacher(User.current.id,@course)
-    case params[:role]
-      when '1'
-        @subPage_title = l :label_teacher_list
-        @members = searchTeacherAndAssistant(@course)
-      when '2'
-        @subPage_title = l :label_student_list
-        @members = searchStudent(@course)
-      else
-        @subPage_title = ''
-        @members = @course.member_principals.includes(:roles, :principal).all.sort
-    end
-    @members = paginateHelper @members
-    render :layout => 'base_courses'
-  end
-
-  #判断指定用户是否为课程教师
-  def isCourseTeacher(id)
-    result = false
-    if  @teachers.find_by_user_id(id) != nil
-      result = true
-    end
-    result
-  end
-
-  def handle_course courses, activities
-    course_activity_count_array=activities.values()
-
-    course_array=[]
-    i=0;
-    courses.each do |course|
-      course_array[i]=course
-      i=i+1
-    end
-
-    courses=desc_sort_course_by_avtivity(course_activity_count_array, course_array)
-
-    return courses
-  end
-
-  def settings
-    @issue_custom_fields = IssueCustomField.sorted.all
-    @issue_category ||= IssueCategory.new
-    @member ||= @course.members.new
-    @trackers = Tracker.sorted.all
-  end
-
-  def create
-    if User.current.user_extensions.identity
-      @course = Course.new
-      @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
-      @course.safe_attributes = params[:course]
-      @course.tea_id = User.current.id
-      # added by bai
-      @course.term = params[:term]
-      @course.time = params[:time]
-      #@course.school_id = params[:occupation]
-      @course.school_id = User.current.user_extensions.school_id
-      @course.setup_time = params[:setup_time]
-      @course.endup_time = params[:endup_time]
-      @course.class_period = params[:class_period]
-    end
-
-    @issue_custom_fields = IssueCustomField.sorted.all
-    @trackers = Tracker.sorted.all
-
-    if User.current.user_extensions.identity == 0
-      if  @course.save
-        #unless User.current.admin?
-        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
-        m = Member.new(:user => User.current, :roles => [r])
-        m.project_id = -1
-        course = CourseInfos.new(:user_id => User.current.id, :course_id => @course.id)
-        #user_grades = UserGrade.create(:user_id => User.current.id, :course_id => @course.id)
-        if params[:course][:is_public] == '1'
-          course_status = CourseStatus.create(:course_id => @course.id, :watchers_count => 0, :changesets_count => 0, :grade => 0, :course_type => @course_tag)
-        end
-        @course.members << m
-        @course.course_infos << course
-        #end
-        respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            if params[:continue]
-              redirect_to new_course_path(attrs, :course => '0')
-            elsif params[:course_continue]
-              redirect_to new_course_path(:course => '1')
-            else
-              redirect_to settings_course_path(@course, :course_type => 1)
-            end
-          }
-          format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
-        end
-      else
-        #@course.destroy
-        respond_to do |format|
-          format.html { render :action => 'new', :layout => 'base' } #Added by young
-          format.api { render_validation_errors(@course) }
-        end
-      end
-    end
-
-  end
-
-  def course
-     @school_id = params[:school_id]
-    per_page_option = 10
-    if @school_id == "0" or @school_id.nil?
-      @courses_all = Course.active.visible.
-          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
-    else
-      @courses_all = Course.active.visible.
-          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
-          joins(:course_extra).
-          where("#{Course.table_name}.school_id = ?", @school_id)
-    end
-
-    @course_count = @courses_all.count
-    @course_pages = Paginator.new @course_count, per_page_option, params['page']
-
-    #gcm activity count
-
-    @course_activity_count=Hash.new
-    #count initialize
-    @courses_all.each do |course|
-      @course_activity_count[course.id]=0
-    end
-
-    #@course_activity_count=get_course_activity @courses_all,@course_activity_count
-    #gcm end
-
-
-    case params[:course_sort_type]
-      when '0'
-        @courses =  @courses_all.order("created_on desc")
-        @s_type = 0
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        #gcm
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-      #gcmend
-
-      when '1'
-        @courses = @courses_all.order("course_ac_para desc")
-        @s_type = 1
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        #gcm
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-      #gcmend
-
-      when '2'
-        @courses = @courses_all.order("watchers_count desc")
-        @s_type = 2
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        #gcm
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-      #gcmend
-
-      #gcm
-      when '3'
-
-        #gcm
-        @course_activity_count=get_course_activity @courses_all,@course_activity_count
-        #gcmend
-
-        @courses=handle_course @courses_all,@course_activity_count
-        @s_type = 3
-        @courses =  @courses[@course_pages.offset, @course_pages.per_page]
-      else
-        @s_type = 0
-        @courses = @courses_all.order("created_on desc")
-        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        #gcm
-        @course_activity_count=get_course_activity @courses,@course_activity_count
-      #gcmend
-
-    end
-
-    respond_to do |format|
-      format.html {
-        render :layout => 'base'
-      }
-      format.api  {
-        #        @offset, @limit = api_offset_and_limit
-        #        @course_count = Course.visible.count
-        #        @courses = Course.visible.offset(@offset).limit(@limit).order('lft').all
-      }
-      format.atom {
-        courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
-        render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
-      }
-    end
-  end
-
-
-  def new
-    @course_type = params[:course_type] ||= params[:course]
-    @issue_custom_fields = IssueCustomField.sorted.all
-    @trackers = Tracker.sorted.all
-
-    @course = Course.new
-    @course.safe_attributes = params[:course]
-
-    render :layout => 'base'
-  end
-
-
-  def desc_sort_course_by_avtivity(activity_count, courses)
-    return courses if activity_count.size<2
-    (activity_count.size-2).downto(0) do |i|
-      (0..i).each do |j|
-        if activity_count[j]<activity_count[j+1]
-          courses[j], courses[j+1]=courses[j+1], courses[j]
-          activity_count[j], activity_count[j+1]=activity_count[j+1], activity_count[j]
-        end
-      end
-    end
-    return courses
-  end
-
-  def index
-    @course_type = params[:course_type]
-    @school_id = params[:school_id]
-    per_page_option = 10
-
-
-    if @school_id == "0" or @school_id.nil?
-      @courses_all = Course.active.visible.
-          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id")
-    else
-      @courses_all = Course.active.visible.
-          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
-          where("#{Course.table_name}.school_id = ?", @school_id)
-    end
-
-    @course_count = @courses_all.count
-    @course_pages = Paginator.new @course_count, per_page_option, params['page']
-
-    @course_activity_count=Hash.new
-    @courses_all.each do |course|
-      @course_activity_count[course.id]=0
-    end
-
-
-    case params[:course_sort_type]
-      when '0'
-        @courses = @courses_all.order("created_at desc")
-        @s_type = 0
-        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-          @course_activity_count=get_course_activity @courses, @course_activity_count
-      when '1'
-        @courses = @courses_all.order("course_ac_para desc")
-        @s_type = 1
-        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        @course_activity_count=get_course_activity @courses, @course_activity_count
-      when '2'
-        @courses = @courses_all.order("watchers_count desc")
-        @s_type = 2
-        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        @course_activity_count=get_course_activity @courses, @course_activity_count
-
-      when '3'
-
-        @course_activity_count=get_course_activity @courses_all, @course_activity_count
-
-        @courses=handle_course @courses_all, @course_activity_count
-
-        @s_type = 3
-        @courses = @courses[@course_pages.offset, @course_pages.per_page]
-      else
-        @s_type = 0
-        @courses = @courses_all.order("created_at desc")
-        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-        @course_activity_count=get_course_activity @courses, @course_activity_count
-    end
-
-    respond_to do |format|
-      format.html {
-        render :layout => 'base'
-      }
-      format.atom {
-        courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
-        render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
-      }
-    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
-      if limit == 0
-        limit = 10
-      end
-      @bids = @bids.offset(@offset).limit(limit).all.reverse
-    end
-    render :layout => 'base_courses'
-   end
-
-  # 新建作业
-  def new_homework
-    @homework = Bid.new
-    @homework.proportion
-    @homework.safe_attributes = params[:bid]
-    if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] ))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-
-  end
-
-
-
-  def toggleCourse
-    @course_prefs = Course.find_by_extra(@course.extra)
-    unless (@course_prefs.teacher == User.current || User.current.admin?)
-      render_403
-    end
-  end
-
-  def get_courses
-    @user = User.current
-    membership = @user.coursememberships.all
-    membership.sort! {|older, newer| newer.created_on <=> older.created_on }
-    @memberships = []
-    membership.collect { |e|
-      @memberships.push(e)
-    }
-    @memberships_doing = []
-    @memberships_done  = []
-    now_time = Time.now.year
-    @memberships.map { |e|
-      end_time = e.course.get_time.year
-      isDone = course_endTime_timeout?(e.course)
-      if isDone
-        @memberships_done.push e
-      else
-        @memberships_doing.push e
-      end
-    }
-  end
-
-  def finishcourse
-    yesterday = Date.today.prev_day.to_time
-
-    @course_prefs.endup_time = yesterday
-    @save_flag = @course_prefs.save
-    get_courses
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-
-  def restartcourse
-    day = Time.parse("3000-01-01")
-
-    @course_prefs.endup_time = day
-    @save_flag = @course_prefs.save
-    get_courses
-
-    respond_to do |format|
-      format.js {
-        render action:'finishcourse'
-      }
-    end
-  end
-
-  def show
-     # try to redirect to the requested menu item
-    if params[:jump] && redirect_to_course_menu_item(@course, params[:jump])
-      return
-    end
-
-    @users_by_role = @course.users_by_role
-    if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
-      @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
-    end
-
-
-    @key = User.current.rss_key
-    #新增内容
-    @days = Setting.activity_days_default.to_i
-
-    if params[:from]
-      begin; @date_to = params[:from].to_date + 1; rescue; end
-    end
-
-    has = {
-        "show_course_files" => true,
-        "show_course_news" => true,
-        "show_course_messages" => true,
-        "show_bids" => true,
-        "show_course_journals_for_messages" => true
-    }
-    @date_to ||= Date.today + 1
-    #
-    @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
-    #@date_from = @date_to - @days-1.years
-    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    # 决定显示所用用户或单个用户活动
-    @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
-                                               :with_subprojects => false,
-                                               :author => @author)
-    @activity.scope_select {|t| has["show_#{t}"]}
-    # modify by nwb
-    # 添加私密性判断
-    if User.current.member_of_course?(@course)|| User.current.admin?
-      events = @activity.events(@date_from, @date_to)
-    else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
-    end
-
-    # 无新动态时，显示老动态
-    if events.count == 0
-      if User.current.member_of_course?(@course)|| User.current.admin?
-        events = @activity.events
-      else
-        events = @activity.events(:is_public => 1)
-      end
-    end
-
-    @offset, @limit = api_offset_and_limit({:limit => 10})
-    @events_count = events.count
-    @events_pages = Paginator.new @events_count, @limit, params['page']
-    @offset ||= @events_pages.offset
-    events = events.slice(@offset,@limit)
-
-    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-    #  documents
-    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
-    #
-    @teachers= searchTeacherAndAssistant(@course)
-    @canShowRealName = isCourseTeacher(User.current.id,@course)
-
-    if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
-      @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
-    end
-
-    respond_to do |format|
-      format.html{render :layout => 'base_courses'}
-      format.api
-    end
-  end
-
-  #判断指定用户是否为课程教师
-  def isCourseTeacher(id,course)
-    result = false
-    user = User.find(id)
-    if user.nil? && user.allowed_to?(:as_teacher,course)#@teachers && @teachers.count != 0 && @teachers.find_by_user_id(id) != nil
-      result = true
-    end
-    result
-  end
-
-  def feedback
-    page = params[:page]
-    # Find the page of the requested reply
-    @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-    @limit =  10
-    if params[:r] && page.nil?
-      offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
-      page = 1 + offset / @limit
-    end
-
-    @feedback_count = @jours.count
-    @feedback_pages = Paginator.new @feedback_count, @limit, page
-    @offset ||= @feedback_pages.offset
-    @jour = @jours[@offset, @limit]
-    @state = false
-    respond_to do |format|
-      format.html{render :layout => 'base_courses'}
-      format.api
-    end
-  end
-
-
-
-  private
-
-  def allow_join
-    if course_endTime_timeout? Course.find(params[:object_id])
-      respond_to do |format|
-        format.js {
-          @state = 2
-          render :partial => 'set_join',
-                 :locals => {:user => User.current,
-                             :course => Course.find(params[:object_id]),
-                             :object_id => params[:object_id]
-                 }
-        }
-      end
-    end
-  end
-
-  #验证是否显示课程
-  def can_show_course
-    @first_page = FirstPage.where("page_type = 'project'").first
-    if @first_page.show_course == 2
-       render_404
-    end
-  end
-
-
-
-end
+class CoursesController < ApplicationController
+  layout 'base_courses'
+  include CoursesHelper
+  helper :activities
+  helper :members
+  helper :words
+
+  menu_item :overview
+  menu_item :feedback, :only => :feedback
+  menu_item :homework, :only => :homework
+
+  menu_item l(:label_sort_by_time), :only => :index
+  menu_item l(:label_sort_by_active), :only => :index
+  menu_item l(:label_sort_by_influence), :only => :index
+
+  before_filter :can_show_course, :except => []
+  before_filter :find_course, :except => [ :index, :search,:list, :new,:join,:unjoin, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+  before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course]
+  before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create]
+  before_filter :require_admin, :only => [:copy, :archive, :unarchive, :destroy, :calendar]
+  before_filter :toggleCourse, only: [:finishcourse, :restartcourse]
+
+  before_filter :require_login, :only => [:join, :unjoin]
+  before_filter :allow_join, :only => [:join]
+
+  def join
+    if User.current.logged?
+      course = Course.find(params[:object_id])
+      if params[:course_password] == course.password
+        members = []
+        members << Member.new(:role_ids => [10], :user_id => User.current.id)
+        course.members << members
+
+        StudentsForCourse.create(:student_id => User.current.id, :course_id => params[:object_id])
+        @state = 0
+      else
+        @state = 1
+      end
+    end
+    respond_to do |format|
+      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Course.find(params[:object_id]), :object_id => params[:object_id]} }
+    end
+  end
+
+  def unjoin
+    if User.current.logged?
+
+      @member = Member.where('course_id = ? and user_id = ?', params[:object_id], User.current.id)
+      @member.first.destroy
+
+      joined = StudentsForCourse.where('student_id = ? and course_id = ?', User.current.id, params[:object_id])
+      joined.each do |join|
+        join.delete
+      end
+    end
+    respond_to do |format|
+      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Course.find(params[:object_id]), :object_id => params[:object_id]} }
+    end
+  end
+
+  #更新课程信息
+  def update
+    @course.safe_attributes = params[:course]
+    @course.time = params[:time]
+    @course.term = params[:term]
+    @course.class_period = params[:class_period]
+    if  @course.save
+      if params[:course][:is_public] == '0'
+        course_status = CourseStatus.find_by_course_id(@course.id)
+        course_status.destroy if course_status
+      elsif params[:course][:is_public] == '1'
+        course_status = CourseStatus.find_by_course_id(@course.id)
+        course_status.destroy if course_status
+        course_status = CourseStatus.create(:course_id => @course.id,  :grade => 0)
+      end
+
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to settings_course_path(@course)
+        }
+        format.api  { render_api_ok }
+      end
+    else
+      respond_to do |format|
+        format.html {
+          settings
+          render :action => 'settings'
+        }
+        format.api  { render_validation_errors(@course) }
+      end
+    end
+  end
+
+  def new_join
+    @course = Course.find(params[:object_id])
+  end
+
+  # 课程搜索
+  # add by nwb
+  def search
+    courses_all = Course.all_course
+    name = params[:name]
+    (redirect_to courses_path, :notice => l(:label_sumbit_empty);return) if name.blank?
+    @courses = courses_all.visible
+    if params[:name].present?
+      @courses_all = @courses.like(params[:name])
+    else
+      @courses_all =  @courses;
+    end
+    @course_count = @courses_all.count
+    @course_pages = Paginator.new @course_count, per_page_option, params['page']
+
+    # 课程的动态数
+    @course_activity_count=Hash.new
+    @courses_all.each do |course|
+      @course_activity_count[course.id]=0
+    end
+
+    case params[:course_sort_type]
+      when '0'
+        @courses =  @courses_all.order("created_at desc")
+        @s_type = 0
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+
+      when '1'
+        @courses = @courses_all.order("course_ac_para desc")
+        @s_type = 1
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+
+      when '2'
+        @courses = @courses_all.order("watchers_count desc")
+        @s_type = 2
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+
+      when '3'
+        @course_activity_count=get_course_activity @courses_all,@course_activity_count_array
+        @courses=handle_course @courses_all,@course_activity_count
+        @s_type = 3
+        @courses =  @courses[@course_pages.offset, @course_pages.per_page]
+
+      else
+        @s_type = 0
+        @courses = @courses_all.order("created_at desc")
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+         @course_activity_count=get_course_activity @courses,@course_activity_count
+
+    end
+
+    respond_to do |format|
+      format.html {
+        render :layout => 'course_base'
+        scope = Course
+        unless params[:closed]
+          scope = scope.active
+        end
+      }
+      format.atom {
+        courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
+        render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
+      }
+    end
+  end
+
+  def member
+    ## 有角色参数的才是课程，没有的就是项目
+    @render_file = 'member_list'
+    @teachers= searchTeacherAndAssistant(@course)
+    @canShowCode = isCourseTeacher(User.current.id,@course)
+    case params[:role]
+      when '1'
+        @subPage_title = l :label_teacher_list
+        @members = searchTeacherAndAssistant(@course)
+      when '2'
+        @subPage_title = l :label_student_list
+        @members = searchStudent(@course)
+      else
+        @subPage_title = ''
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
+    end
+    @members = paginateHelper @members
+    render :layout => 'base_courses'
+  end
+
+  #判断指定用户是否为课程教师
+  def isCourseTeacher(id)
+    result = false
+    if  @teachers.find_by_user_id(id) != nil
+      result = true
+    end
+    result
+  end
+
+  def handle_course courses, activities
+    course_activity_count_array=activities.values()
+
+    course_array=[]
+    i=0;
+    courses.each do |course|
+      course_array[i]=course
+      i=i+1
+    end
+
+    courses=desc_sort_course_by_avtivity(course_activity_count_array, course_array)
+
+    return courses
+  end
+
+  def settings
+    @issue_custom_fields = IssueCustomField.sorted.all
+    @issue_category ||= IssueCategory.new
+    @member ||= @course.members.new
+    @trackers = Tracker.sorted.all
+  end
+
+  def create
+    if User.current.user_extensions.identity
+      @course = Course.new
+      @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
+      @course.safe_attributes = params[:course]
+      @course.tea_id = User.current.id
+      # added by bai
+      @course.term = params[:term]
+      @course.time = params[:time]
+      #@course.school_id = params[:occupation]
+      @course.school_id = User.current.user_extensions.school_id
+      @course.setup_time = params[:setup_time]
+      @course.endup_time = params[:endup_time]
+      @course.class_period = params[:class_period]
+    end
+
+    @issue_custom_fields = IssueCustomField.sorted.all
+    @trackers = Tracker.sorted.all
+
+    if User.current.user_extensions.identity == 0
+      if  @course.save
+        #unless User.current.admin?
+        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+        m = Member.new(:user => User.current, :roles => [r])
+        m.project_id = -1
+        course = CourseInfos.new(:user_id => User.current.id, :course_id => @course.id)
+        #user_grades = UserGrade.create(:user_id => User.current.id, :course_id => @course.id)
+        if params[:course][:is_public] == '1'
+          course_status = CourseStatus.create(:course_id => @course.id, :watchers_count => 0, :changesets_count => 0, :grade => 0, :course_type => @course_tag)
+        end
+        @course.members << m
+        @course.course_infos << course
+        #end
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_create)
+            if params[:continue]
+              redirect_to new_course_path(attrs, :course => '0')
+            elsif params[:course_continue]
+              redirect_to new_course_path(:course => '1')
+            else
+              redirect_to settings_course_path(@course, :course_type => 1)
+            end
+          }
+          format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
+        end
+      else
+        #@course.destroy
+        respond_to do |format|
+          format.html { render :action => 'new', :layout => 'base' } #Added by young
+          format.api { render_validation_errors(@course) }
+        end
+      end
+    end
+
+  end
+
+  def course
+     @school_id = params[:school_id]
+    per_page_option = 10
+    if @school_id == "0" or @school_id.nil?
+      @courses_all = Course.active.visible.
+          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
+    else
+      @courses_all = Course.active.visible.
+          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
+          joins(:course_extra).
+          where("#{Course.table_name}.school_id = ?", @school_id)
+    end
+
+    @course_count = @courses_all.count
+    @course_pages = Paginator.new @course_count, per_page_option, params['page']
+
+    #gcm activity count
+
+    @course_activity_count=Hash.new
+    #count initialize
+    @courses_all.each do |course|
+      @course_activity_count[course.id]=0
+    end
+
+    #@course_activity_count=get_course_activity @courses_all,@course_activity_count
+    #gcm end
+
+
+    case params[:course_sort_type]
+      when '0'
+        @courses =  @courses_all.order("created_on desc")
+        @s_type = 0
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        #gcm
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+      #gcmend
+
+      when '1'
+        @courses = @courses_all.order("course_ac_para desc")
+        @s_type = 1
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        #gcm
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+      #gcmend
+
+      when '2'
+        @courses = @courses_all.order("watchers_count desc")
+        @s_type = 2
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        #gcm
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+      #gcmend
+
+      #gcm
+      when '3'
+
+        #gcm
+        @course_activity_count=get_course_activity @courses_all,@course_activity_count
+        #gcmend
+
+        @courses=handle_course @courses_all,@course_activity_count
+        @s_type = 3
+        @courses =  @courses[@course_pages.offset, @course_pages.per_page]
+      else
+        @s_type = 0
+        @courses = @courses_all.order("created_on desc")
+        @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        #gcm
+        @course_activity_count=get_course_activity @courses,@course_activity_count
+      #gcmend
+
+    end
+
+    respond_to do |format|
+      format.html {
+        render :layout => 'base'
+      }
+      format.api  {
+        #        @offset, @limit = api_offset_and_limit
+        #        @course_count = Course.visible.count
+        #        @courses = Course.visible.offset(@offset).limit(@limit).order('lft').all
+      }
+      format.atom {
+        courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
+        render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
+      }
+    end
+  end
+
+
+  def new
+    @course_type = params[:course_type] ||= params[:course]
+    @issue_custom_fields = IssueCustomField.sorted.all
+    @trackers = Tracker.sorted.all
+
+    @course = Course.new
+    @course.safe_attributes = params[:course]
+
+    render :layout => 'base'
+  end
+
+
+  def desc_sort_course_by_avtivity(activity_count, courses)
+    return courses if activity_count.size<2
+    (activity_count.size-2).downto(0) do |i|
+      (0..i).each do |j|
+        if activity_count[j]<activity_count[j+1]
+          courses[j], courses[j+1]=courses[j+1], courses[j]
+          activity_count[j], activity_count[j+1]=activity_count[j+1], activity_count[j]
+        end
+      end
+    end
+    return courses
+  end
+
+  def index
+    @course_type = params[:course_type]
+    @school_id = params[:school_id]
+    per_page_option = 10
+
+
+    if @school_id == "0" or @school_id.nil?
+      @courses_all = Course.active.visible.
+          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id")
+    else
+      @courses_all = Course.active.visible.
+          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
+          where("#{Course.table_name}.school_id = ?", @school_id)
+    end
+
+    @course_count = @courses_all.count
+    @course_pages = Paginator.new @course_count, per_page_option, params['page']
+
+    @course_activity_count=Hash.new
+    @courses_all.each do |course|
+      @course_activity_count[course.id]=0
+    end
+
+
+    case params[:course_sort_type]
+      when '0'
+        @courses = @courses_all.order("created_at desc")
+        @s_type = 0
+        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+          @course_activity_count=get_course_activity @courses, @course_activity_count
+      when '1'
+        @courses = @courses_all.order("course_ac_para desc")
+        @s_type = 1
+        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        @course_activity_count=get_course_activity @courses, @course_activity_count
+      when '2'
+        @courses = @courses_all.order("watchers_count desc")
+        @s_type = 2
+        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        @course_activity_count=get_course_activity @courses, @course_activity_count
+
+      when '3'
+
+        @course_activity_count=get_course_activity @courses_all, @course_activity_count
+
+        @courses=handle_course @courses_all, @course_activity_count
+
+        @s_type = 3
+        @courses = @courses[@course_pages.offset, @course_pages.per_page]
+      else
+        @s_type = 0
+        @courses = @courses_all.order("created_at desc")
+        @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
+
+        @course_activity_count=get_course_activity @courses, @course_activity_count
+    end
+
+    respond_to do |format|
+      format.html {
+        render :layout => 'base'
+      }
+      format.atom {
+        courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
+        render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
+      }
+    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
+      if limit == 0
+        limit = 10
+      end
+      @bids = @bids.offset(@offset).limit(limit).all.reverse
+    end
+    render :layout => 'base_courses'
+   end
+
+  # 新建作业
+  def new_homework
+    @homework = Bid.new
+    @homework.proportion
+    @homework.safe_attributes = params[:bid]
+    if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] ))
+      render :layout => 'base_courses'
+    else
+      render_403
+    end
+
+  end
+
+
+
+  def toggleCourse
+    @course_prefs = Course.find_by_extra(@course.extra)
+    unless (@course_prefs.teacher == User.current || User.current.admin?)
+      render_403
+    end
+  end
+
+  def get_courses
+    @user = User.current
+    membership = @user.coursememberships.all
+    membership.sort! {|older, newer| newer.created_on <=> older.created_on }
+    @memberships = []
+    membership.collect { |e|
+      @memberships.push(e)
+    }
+    @memberships_doing = []
+    @memberships_done  = []
+    now_time = Time.now.year
+    @memberships.map { |e|
+      end_time = e.course.get_time.year
+      isDone = course_endTime_timeout?(e.course)
+      if isDone
+        @memberships_done.push e
+      else
+        @memberships_doing.push e
+      end
+    }
+  end
+
+  def finishcourse
+    yesterday = Date.today.prev_day.to_time
+
+    @course_prefs.endup_time = yesterday
+    @save_flag = @course_prefs.save
+    get_courses
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
+
+  def restartcourse
+    day = Time.parse("3000-01-01")
+
+    @course_prefs.endup_time = day
+    @save_flag = @course_prefs.save
+    get_courses
+
+    respond_to do |format|
+      format.js {
+        render action:'finishcourse'
+      }
+    end
+  end
+
+  def show
+     # try to redirect to the requested menu item
+    if params[:jump] && redirect_to_course_menu_item(@course, params[:jump])
+      return
+    end
+
+    @users_by_role = @course.users_by_role
+    if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
+      @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
+    end
+
+
+    @key = User.current.rss_key
+    #新增内容
+    @days = Setting.activity_days_default.to_i
+
+    if params[:from]
+      begin; @date_to = params[:from].to_date + 1; rescue; end
+    end
+
+    has = {
+        "show_course_files" => true,
+        "show_course_news" => true,
+        "show_course_messages" => true,
+        "show_bids" => true,
+        "show_course_journals_for_messages" => true
+    }
+    @date_to ||= Date.today + 1
+    #
+    @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
+    #@date_from = @date_to - @days-1.years
+    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
+    # 决定显示所用用户或单个用户活动
+    @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
+                                               :with_subprojects => false,
+                                               :author => @author)
+    @activity.scope_select {|t| has["show_#{t}"]}
+    # modify by nwb
+    # 添加私密性判断
+    if User.current.member_of_course?(@course)|| User.current.admin?
+      events = @activity.events(@date_from, @date_to)
+    else
+      events = @activity.events(@date_from, @date_to, :is_public => 1)
+    end
+
+    # 无新动态时，显示老动态
+    if events.count == 0
+      if User.current.member_of_course?(@course)|| User.current.admin?
+        events = @activity.events
+      else
+        events = @activity.events(:is_public => 1)
+      end
+    end
+
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @events_count = events.count
+    @events_pages = Paginator.new @events_count, @limit, params['page']
+    @offset ||= @events_pages.offset
+    events = events.slice(@offset,@limit)
+
+    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
+    #  documents
+    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
+    #
+    @teachers= searchTeacherAndAssistant(@course)
+    @canShowRealName = isCourseTeacher(User.current.id,@course)
+
+    if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
+      @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
+    end
+
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+      format.api
+    end
+  end
+
+  #判断指定用户是否为课程教师
+  def isCourseTeacher(id,course)
+    result = false
+    user = User.find(id)
+    if user.nil? && user.allowed_to?(:as_teacher,course)#@teachers && @teachers.count != 0 && @teachers.find_by_user_id(id) != nil
+      result = true
+    end
+    result
+  end
+
+  def feedback
+    page = params[:page]
+    # Find the page of the requested reply
+    @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    @limit =  10
+    if params[:r] && page.nil?
+      offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
+      page = 1 + offset / @limit
+    end
+
+    @feedback_count = @jours.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, page
+    @offset ||= @feedback_pages.offset
+    @jour = @jours[@offset, @limit]
+    @state = false
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+      format.api
+    end
+  end
+
+
+
+  private
+
+  def allow_join
+    if course_endTime_timeout? Course.find(params[:object_id])
+      respond_to do |format|
+        format.js {
+          @state = 2
+          render :partial => 'set_join',
+                 :locals => {:user => User.current,
+                             :course => Course.find(params[:object_id]),
+                             :object_id => params[:object_id]
+                 }
+        }
+      end
+    end
+  end
+
+  #验证是否显示课程
+  def can_show_course
+    @first_page = FirstPage.where("page_type = 'project'").first
+    if @first_page.show_course == 2
+       render_404
+    end
+  end
+
+
+
+end
diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index 1606d97d6..27e38f999 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -1,4 +1,4 @@
-<h3><%=l(:label_news)%></h3>
+<h3><%=l(:label_edit_contest_notice)%></h3>
 
 <%= labelled_form_for @contestnotification,
                       :url =>  contest_contestnotification_path,
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index a44ee5909..47cdd3a86 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,4 +1,8 @@
-
+<script>
+    function cancel() {
+        $("#add_contestnotification").hide();
+    }
+</script>
 <div class="contextual">
 	<%= link_to(l(:button_edit),
                 edit_contest_contestnotification_path(@contest, @contestnotification),
@@ -27,7 +31,7 @@
 
 <div id="notificationcomments" style="margin-bottom:16px;">
 
-	<div style="margin:15px">
+	<div style="margin:15px" id ="add_contestnotification">
 		<span class="font_description">
           <%= textilizable(@contestnotification, :description) %>
         </span>
@@ -62,7 +66,17 @@
 		</div>
 		<p>
 			<%= submit_tag l(:button_add) %>
-			<%= submit_tag l(:button_cancel), :onclick => "cancel();" %>
+
+            <!--modified by longjun 点击取消时收回添加回复的部分-->
+
+          <%= submit_tag l(:button_cancel),
+                         :name => nil,
+                         :onclick => "cancel();",
+                         :type => 'button',
+                         :class => "enterprise",
+                         :onmouseout => "this.style.backgroundPosition = 'left top'",
+                         :onmouseover => "this.style.backgroundPosition = 'left -30px'"
+          %>
 		</p>
 		<% end %>
 		
@@ -97,7 +111,8 @@
                       </span>
                         <%= l(:label_comment_plural) %>
                     </td>
-                    <td>
+                    <!--modified by longjun 删除变成竖的，IE浏览器兼容，将宽度设置为40px-->
+                    <td width="40px">
                       <% if notificationcomment.author==User.current|| User.current.admin? %>
                           <%= link_to(l(:label_bid_respond_delete),
                                       contest_contestnotification_notificationcomment_path(@contest, @contestnotification,notificationcomment),
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b3bdc53f7..2e6fe6ddb 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -705,6 +705,7 @@ zh:
   label_report_plural: 报表
   label_news: 新闻
   label_news_new: 添加新闻
+  label_edit_contest_notice: 编辑竞赛通知
   bale_news_notice: 添加通知 #huang
   bale_edit_notice: 修改通知
   label_news_notice: 发布课程通知
@@ -2045,6 +2046,7 @@ zh:
   label_contest_settings: 配置竞赛
   label_contest_delete: 删除竞赛
   label_noawards_current: 暂未评奖
+
   
   label_softapplication: 应用软件
   label_attending_contest: 参加竞赛

From 96268d70079a5c86e1498761bd19eb2fab2e0e2a Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 24 Sep 2014 15:18:58 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=E7=82=B9=E5=87=BBc?=
 =?UTF-8?q?ontest=E4=B8=BB=E9=A1=B5=E6=9C=80=E6=96=B0=E5=8F=82=E8=B5=9B?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E2=80=9C=E6=9B=B4=E5=A4=9A=E2=80=9D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=BF=94=E5=9B=9E=E5=BC=82=E5=B8=B8=20Signed-off-by:?=
 =?UTF-8?q?=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/softapplications/_list.html.erb | 29 +++++------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/views/softapplications/_list.html.erb b/app/views/softapplications/_list.html.erb
index e31aedda7..91c49cda3 100644
--- a/app/views/softapplications/_list.html.erb
+++ b/app/views/softapplications/_list.html.erb
@@ -9,30 +9,13 @@
       <div style="float: left; width: 600px; padding-top: 6px; margin-left: 8px"><%= softapplication.description.truncate(95, omission: '...') %></div>
       <div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; line-height: 0.5em ">
         <%contest = softapplication.contests.first%>
-        <!--<table width="100%" border="0">-->
-          <!--<tr>-->
-            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_contest)%>：</td>-->
-            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
-              <!--<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>-->
-            <!--</td>-->
-          <!--</tr>-->
-          <!--<tr>-->
-            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_type)%>：</td>-->
-            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
-              <!--<%= softapplication.app_type_name %>-->
-            <!--</td>-->
-          <!--</tr>-->
-          <!--<tr>-->
-            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_adaptive_system)%>：</td>-->
-            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
-              <!--<%= softapplication.android_min_version_available %>-->
-            <!--</td>-->
-          <!--</tr>-->
-        <!--</table>-->
+
         <p><%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%></p>
-        <p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(14, omission: '...') %></p>
-        <%strTitle = softapplication.android_min_version_available%>
-        <p><%=l(:label_attendingcontestwork_adaptive_system)%>：<lable title="<%= strTitle %>"><%= strTitle.truncate(10,omisiion:'...') %></lable></p>
+
+        <!--modified by longjun 因为新建竞赛作品时没有填写运行平台和类别，所有如果为空不能使用truncate函数-->
+        <p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name ? softapplication.app_type_name.truncate(14, omission: '...') : "" %></p>
+        <% strTitle = softapplication.android_min_version_available %>
+        <p><%=l(:label_attendingcontestwork_adaptive_system)%>：<lable title="<%= strTitle %>"><%= strTitle ? strTitle.truncate(10,omisiion:'...') : "" %></lable></p>
       </div>
       <div style="padding-left: 53px">
         <span><%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %></span>

From 67162bd8fb652581edef2b381800bebf66145b22 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 24 Sep 2014 17:36:49 +0800
Subject: [PATCH 09/19] =?UTF-8?q?admin=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=9D=83=E9=99=90=E3=80=81=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E3=80=81=EF=BC=9B=E7=AB=9E=E8=B5=9B=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=86=E5=BC=80=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/roles/_form.html.erb | 53 +++++++++++++++++++++++++++++-----
 lib/redmine.rb                 | 35 +++++++++++-----------
 lib/redmine/access_control.rb  | 17 ++++++++++-
 3 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb
index d028c2f1c..0e55b0c39 100644
--- a/app/views/roles/_form.html.erb
+++ b/app/views/roles/_form.html.erb
@@ -18,15 +18,52 @@
 <div class="box tabular" id="permissions">
 <% perms_by_module = @role.setable_permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
-    <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
-    <% perms_by_module[mod].each do |permission| %>
-        <label class="floating">
-        <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
-        <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
-        </label>
-    <% end %>
+  <% if mod.blank? %>
+    <fieldset>
+      <legend><%= l(:label_project) %></legend>
+      <% perms_by_module[mod].each do |permission| %>
+        <% if permission.belong_to_project? %>
+          <label class="floating">
+            <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+          </label>
+        <% end %>
+      <% end %>
     </fieldset>
-<% end %>
+    <fieldset>
+      <legend><%= l(:label_course) %></legend>
+      <% perms_by_module[mod].each do |permission| %>
+        <% if permission.belong_to_course? %>
+          <label class="floating">
+            <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+          </label>
+        <% end %>
+      <% end %>
+    </fieldset>
+    <fieldset>
+    <legend><%= l(:label_contest) %></legend>
+      <% perms_by_module[mod].each do |permission| %>
+        <% if permission.belong_to_contest? %>
+          <label class="floating">
+            <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+           </label>
+        <% end %>
+      <% end %>
+    </fieldset>
+  <% else %>
+    <fieldset>
+      <legend><%= l_or_humanize(mod, :prefix => 'project_module_') %></legend>
+        <% perms_by_module[mod].each do |permission| %>
+          <label class="floating">
+             <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+             <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+           </label>
+        <% end %>
+      </fieldset>
+    <% end %>
+  <% end %>
 <br /><%= check_all_links 'permissions' %>
 <%= hidden_field_tag 'role[permissions][]', '' %>
 </div>
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 64b39145e..17234b54f 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -89,29 +89,28 @@ end
 Redmine::AccessControl.map do |map|
   map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true, :read => true
   map.permission :search_project, {:search => :index}, :public => true, :read => true
-  map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
-  map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
-  map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true
-  map.permission :select_project_modules, {:projects => :modules}, :require => :member
-  map.permission :select_contest_modules, {:contests => :modules}, :require => :member
-  map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member
-  map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
-  map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
+  map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin ,:belong_to_project => true
+  map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member ,:belong_to_project => true
+  map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_project => true
+  map.permission :select_project_modules, {:projects => :modules}, :require => :member ,:belong_to_project => true
+  map.permission :select_contest_modules, {:contests => :modules}, :require => :member ,:belong_to_contest => true
+  map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member ,:belong_to_project => true
+  map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member ,:belong_to_project => true
+  map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member ,:belong_to_project => true
   map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true
-  map.permission :quote_project, {},:require => :member
-  map.permission :is_manager,{},:require => :member
-  map.permission :as_teacher,{},:require => :member
-  map.permission :as_student,{},:require => :member
+  map.permission :quote_project, {},:require => :member,:belong_to_contest => true
+  map.permission :is_manager,{},:require => :member ,:belong_to_project => true
+  map.permission :as_teacher,{},:require => :member ,:belong_to_course => true
+  map.permission :as_student,{},:require => :member ,:belong_to_course => true
 
   #课程权限模块
-  #added by nwb
   map.permission :view_course, {:courses => [:show], :activities => [:index]}, :public => true, :read => true
   map.permission :search_course, {:search => :index}, :public => true, :read => true
-  map.permission :add_course, {:courses => [:new, :create]}, :require => :loggedin
-  map.permission :edit_course, {:courses => [:settings, :edit, :update]}, :require => :member
-  map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true
-  map.permission :select_course_modules, {:courses => :modules}, :require => :member
-  map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true
+  map.permission :add_course, {:courses => [:new, :create]}, :require => :loggedin ,:belong_to_course => true
+  map.permission :edit_course, {:courses => [:settings, :edit, :update]}, :require => :member  ,:belong_to_course => true
+  map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_course => true
+  map.permission :select_course_modules, {:courses => :modules}, :require => :member  ,:belong_to_course => true
+  map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true  ,:belong_to_course => true
 
   map.course_module :files do |map|
     map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb
index e71c0090a..efcaca627 100644
--- a/lib/redmine/access_control.rb
+++ b/lib/redmine/access_control.rb
@@ -126,7 +126,9 @@ module Redmine
         @course_module = options[:course_module]
         @project_module = options[:project_module]
         @contest_module = options[:contest_module]
-        
+        @belong_to_project = options[:belong_to_project] || false
+        @belong_to_course = options[:belong_to_course] || false
+        @belong_to_contest =options[:belong_to_contest] || false
         hash.each do |controller, actions|
           if actions.is_a? Array
             @actions << actions.collect {|action| "#{controller}/#{action}"}
@@ -152,6 +154,19 @@ module Redmine
       def read?
         @read
       end
+
+      def belong_to_project?
+        @belong_to_project
+      end
+
+      def belong_to_course?
+        @belong_to_course
+      end
+
+      def belong_to_contest?
+        @belong_to_contest
+      end
+
     end
   end
 end

From 21343a01113a15f7150d104d7352454220e38874 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 25 Sep 2014 15:34:00 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90=E6=8A=A5=E8=A1=A8=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9D=83=E9=99=90=E4=B8=8E=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E5=BC=80=E6=95=B4=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?#1300=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86--=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=92=8C=E6=9D=83=E9=99=90--=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=20=E8=A7=A3=E5=86=B3=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9css=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/roles/permissions.html.erb | 126 +++++++++++++++++++++++----
 config/locales/en.yml                |   2 +
 config/locales/zh.yml                |   2 +-
 lib/redmine.rb                       |  51 ++++++-----
 public/stylesheets/application.css   |   2 +-
 5 files changed, 142 insertions(+), 41 deletions(-)

diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index 1942092cd..2d59c86eb 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -19,33 +19,127 @@
 <tbody>
 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
-    <% unless mod.blank? %>
+    <% if mod.blank? %>
+        <% perms_by_module[mod].select{ |p| !(p.belong_to_project?) && !(p.belong_to_course?) && !(p.belong_to_contest?) }.each do |permission| %>
+            <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+              <td>
+                <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+              </td>
+              <% @roles.each do |role| %>
+                  <td align="center">
+                    <% if role.setable_permissions.include? permission %>
+                        <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+                    <% end %>
+                  </td>
+              <% end %>
+            </tr>
+        <% end %>
+
         <tr class="group open">
           <td>
             <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
-            <%= l_or_humanize(mod, :prefix => 'project_module_') %>
+            <%= l(:label_project) %>
           </td>
           <% @roles.each do |role| %>
-          <td class="role"><%= h(role.name) %></td>
+              <td class="role"><%= h(role.name) %></td>
           <% end %>
         </tr>
-    <% end %>
-    <% perms_by_module[mod].each do |permission| %>
-        <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
-        <td>
-            <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
-                                                                :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
-            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
-        </td>
-        <% @roles.each do |role| %>
-        <td align="center">
-        <% if role.setable_permissions.include? permission %>
-          <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+        <% perms_by_module[mod].select{ |p| p.belong_to_project? }.each do |permission| %>
+            <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+              <td>
+                <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+              </td>
+              <% @roles.each do |role| %>
+                  <td align="center">
+                    <% if role.setable_permissions.include? permission %>
+                        <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+                    <% end %>
+                  </td>
+              <% end %>
+            </tr>
+        <% end %>
+        <tr class="group open">
+          <td>
+            <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+            <%= l(:label_course) %>
+          </td>
+          <% @roles.each do |role| %>
+              <td class="role"><%= h(role.name) %></td>
+          <% end %>
+        </tr>
+        <% perms_by_module[mod].select{ |p| p.belong_to_course? }.each do |permission| %>
+            <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+              <td>
+                <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+              </td>
+              <% @roles.each do |role| %>
+                  <td align="center">
+                    <% if role.setable_permissions.include? permission %>
+                        <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+                    <% end %>
+                  </td>
+              <% end %>
+            </tr>
         <% end %>
-        </td>
+        <tr class="group open">
+          <td>
+            <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+            <%= l(:label_contest) %>
+          </td>
+          <% @roles.each do |role| %>
+              <td class="role"><%= h(role.name) %></td>
+          <% end %>
+        </tr>
+        <% perms_by_module[mod].select{ |p| p.belong_to_contest? }.each do |permission| %>
+            <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+              <td>
+                <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+              </td>
+              <% @roles.each do |role| %>
+                  <td align="center">
+                    <% if role.setable_permissions.include? permission %>
+                        <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+                    <% end %>
+                  </td>
+              <% end %>
+            </tr>
         <% end %>
+    <% else %>
+        <tr class="group open">
+          <td>
+            <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+            <%= l_or_humanize(mod, :prefix => 'project_module_') %>
+          </td>
+          <% @roles.each do |role| %>
+              <td class="role"><%= h(role.name) %></td>
+          <% end %>
         </tr>
+        <% perms_by_module[mod].each do |permission| %>
+            <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+              <td>
+                <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+              </td>
+              <% @roles.each do |role| %>
+                  <td align="center">
+                    <% if role.setable_permissions.include? permission %>
+                        <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+                    <% end %>
+                  </td>
+              <% end %>
+            </tr>
+        <% end %>
     <% end %>
+
 <% end %>
 </tbody>
 </table>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8ba8402ed..d7b7f5421 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -497,6 +497,8 @@ en:
   permission_view_real_name: View real name
   permission_view_students: View students
   permission_export_homeworks: Export homeworks
+  permission_notificationcomment_contestnotifications: Add the notice of contest comments
+
 
   project_module_issue_tracking: Issue tracking
   project_module_time_tracking: Time tracking
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2e6fe6ddb..4201f7119 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -491,7 +491,7 @@ zh:
   permission_edit_course: 编辑课程
   permission_select_contest_modules: 选择竞赛模块
   permission_manage_contestnotifications: 管理竞赛通知
-
+  permission_notificationcomment_contestnotifications: 添加竞赛通知评论
 
 
   project_module_issue_tracking: 问题跟踪
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 17234b54f..e0a14c7e9 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -97,7 +97,9 @@ Redmine::AccessControl.map do |map|
   map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member ,:belong_to_project => true
   map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member ,:belong_to_project => true
   map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member ,:belong_to_project => true
-  map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true
+  #错的权限，先注释掉
+  #map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true
+
   map.permission :quote_project, {},:require => :member,:belong_to_contest => true
   map.permission :is_manager,{},:require => :member ,:belong_to_project => true
   map.permission :as_teacher,{},:require => :member ,:belong_to_course => true
@@ -112,30 +114,33 @@ Redmine::AccessControl.map do |map|
   map.permission :select_course_modules, {:courses => :modules}, :require => :member  ,:belong_to_course => true
   map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true  ,:belong_to_course => true
 
-  map.course_module :files do |map|
-    map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
-    map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true
-  end
-    map.course_module :news do |map|
-    map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
-    map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true
-    map.permission :comment_news, {:comments => :create}
-    end
+  #与项目一致，注释掉
+  #map.course_module :files do |map|
+  #  map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
+  #  map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true
+  #end
+  #新闻权限与项目一致注释掉此处
+  #  map.course_module :news do |map|
+  #  map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
+  #  map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true
+  #  map.permission :comment_news, {:comments => :create}
+  #  end
   #作业模块权限
   map.course_module :bids do |map|
-    map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true
-    map.permission :paret_in_homework,{},:require => :member
+    map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true
+    map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true
   end
 
-  map.course_module :boards do |map|
-    map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member
-    map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true
-    map.permission :add_messages, {:messages => [:new, :reply, :quote]}
-    map.permission :edit_messages, {:messages => :edit}, :require => :member
-    map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
-    map.permission :delete_messages, {:messages => :destroy}, :require => :member
-    map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
-  end
+  #讨论区权限与项目统一，注释掉此课程讨论区权限
+  #map.course_module :boards do |map|
+  #  map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member
+  #  map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true
+  #  map.permission :add_messages, {:messages => [:new, :reply, :quote]}
+  #  map.permission :edit_messages, {:messages => :edit}, :require => :member
+  #  map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
+  #  map.permission :delete_messages, {:messages => :destroy}, :require => :member
+  #  map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
+  #end
 
   #end
 
@@ -188,9 +193,9 @@ Redmine::AccessControl.map do |map|
   end
 
   map.contest_module :contestnotifications do |map|
-    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member
+    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member,:belong_to_contest => true
     map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true
-    map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create}
+    map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create},:belong_to_contest => true
   end
 
   map.project_module :documents do |map|
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1fda63f93..d69ed6171 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1273,7 +1273,7 @@ a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repea
 a#toggle-completed-versions {color:#999;}
 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
-table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
+table.list th {  background-color:#EEEEEE; padding: 4px; white-space:pre-line; }
 table.list td { vertical-align: top; padding-right:10px; }
 table.list td.id { width: 2%; text-align: center;}
 table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }

From 0eaf95b53d609c4e4598dbd35904c9e5b67114cf Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 25 Sep 2014 16:10:31 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=20#1284=20=E5=85=AC=E5=91=8A=E8=B4=B4?=
 =?UTF-8?q?=E5=90=A7=EF=BC=9A=E7=BC=96=E8=BE=91=E5=9B=9E=E5=B8=96=E4=B8=AD?=
 =?UTF-8?q?=E2=80=9C=E7=BD=AE=E9=A1=B6=E2=80=9D=E3=80=81=E2=80=9C=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A=E2=80=9D=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?,=E5=9B=9E=E5=B8=96=E4=B8=8D=E5=8F=AF=E2=80=98=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E2=80=99=E3=80=81=E2=80=98=E9=94=81=E5=AE=9A=E2=80=99?=
 =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E8=BF=99=E4=B8=A4=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=94=E5=B0=86=E4=B8=BB=E9=A2=98=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/edit.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index 35543398f..04d95ae86 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -1,5 +1,5 @@
 <!-- <h1>New memo</h1> -->
-<% @replying ||= false %>
+<% @replying = !@memo.parent.nil? %>
 <h3><%=l(:label_memo_edit)%></h3>
 <%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f|  %>
   <% if @memo.errors.any? %>
@@ -13,7 +13,7 @@
     </div>
   <% end %>
   <div class="actions">
-    <p><%= f.text_field :subject, :required => true, :size => 96 %></p>
+    <p><%= f.text_field :subject, :required => true, :size => 96 ,:readonly => @replying%></p>
     <p>
       <% unless @replying %>
         <% if @memo.safe_attribute? 'sticky' %>

From 3393b8ba7317cdd8215085f3ac43d7d41b3b675a Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 25 Sep 2014 16:28:55 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=B8=96=E7=9A=84=E4=B8=BB=E9=A2=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9CRE=EF=BC=9A=20=E2=80=9D=E5=89=8D=E7=BC=80=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=B8=96=E5=AD=90=E6=97=B6=E7=9A=84=E2=80=9C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A2=98=E2=80=9D=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E7=BC=96=E8=BE=91=E5=B8=96=E5=AD=90=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/_reply_box.html.erb | 2 +-
 config/locales/zh.yml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb
index 9dddf5be4..e3346ee32 100644
--- a/app/views/memos/_reply_box.html.erb
+++ b/app/views/memos/_reply_box.html.erb
@@ -1,5 +1,5 @@
 <%= form_for(@memo_new, url: forum_memos_path, :html => {:multipart => true}) do |f| %>
-		<%= f.hidden_field :subject, :required => true, value: @memo.subject %>
+		<%= f.hidden_field :subject, :required => true, value: "RE: "+@memo.subject %>
 		<%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
 		<%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
     <div id="message_quote" class="wiki"></div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 4201f7119..a85f40e20 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1938,7 +1938,7 @@ zh:
   label_forum_edit: 编辑讨论区
   label_memo_create: 发布
   label_memo_new: 新建帖子
-  label_memo_edit: 修改主题
+  label_memo_edit: 编辑帖子
   label_memo_new_from_forum: 发布帖子
   label_forum: 公共贴吧
   label_forum_new: 新建贴吧

From f1aa0c1570a6e1607b843ab8be6154411f1143a7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 26 Sep 2014 09:13:13 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E5=8F=B7=E6=8F=90=E7=A4=BA=20#1287?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/register.html.erb    | 117 ++++++++--------
 app/views/bids/_homework_list.html.erb | 178 ++++++++++++-------------
 2 files changed, 147 insertions(+), 148 deletions(-)

diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 21c8c11b9..27732b549 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -291,7 +291,6 @@
 
 <%= labelled_form_for @user, :url => register_path do |f| %>
     <%= error_messages_for 'user' %>
-
     <div class="box tabular">
       <p>
       <table>
@@ -305,73 +304,80 @@
               <option value="1"><%= l(:label_student) %></option>
               <option value="2"><%= l(:label_enterprise) %></option>
               <option value="3"><%= l(:label_account_developer) %></option>
-
             </select>
           </td>
           <td>
-<span id='technical_title' style='display:none'>
-<select name="technical_title" id="userTechnical_title"></select></span>
-<span id='no' style='display:none'>
-	
-  <% unless User.current.user_extensions.nil? %>
-<%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %></span>
-<% else %>
-<%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
-<% end %>
-  </td>
+            <span id='technical_title' style='display:none'>
+                <select name="technical_title" id="userTechnical_title"></select>
+            </span>
+            <span id='no' style='display:none'>
+              <strong>
+                <%= l(:label_bidding_user_studentcode)  %>
+                <span class="required"> *</span>
+              </strong>
+              <% unless User.current.user_extensions.nil? %>
+                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
+                <% else %>
+                <%= text_field_tag :no, nil, :placeholder => "请输入学号" %>
+              <% end %>
+            </span>
+          </td>
         </tr>
       </table>
       </p>
-
       <% if @user.auth_source_id.nil? %>
           <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
-            <em class="info"><%= l(:label_max_number) %></em></p>
-
+            <em class="info"><%= l(:label_max_number) %></em>
+          </p>
           <p><%= f.password_field :password, :size => 25, :required => true %>
-            <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
-
+            <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
+          </p>
           <p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
       <% end %>
       <span id='name' style='display:none'>
-<p><%= f.text_field :firstname, :required => true %></p>
-<p><%= f.text_field :lastname, :required => true %></p>
-</span>
-<span id='enterprise' style='display:none'>
-<p><table>
-  <tr>
-    <td class="info" align="right" style="width: 90px"><strong>企业名<span class="required"> *</span></strong></td>
-    <td class="info" style="width: 10px">
-      <%= text_field_tag :enterprise_name %></td>
-  </tr>
-</table>
-  </p>
-</span>
-
-      <p><%= f.text_field :mail, :required => true %><span id="valid_user_mail"></span></p>
-
+        <p><%= f.text_field :firstname, :required => true %></p>
+        <p><%= f.text_field :lastname, :required => true %></p>
+      </span>
+      <span id='enterprise' style='display:none'>
+        <p>
+            <table>
+              <tr>
+                <td class="info" align="right" style="width: 90px">
+                  <strong>企业名
+                    <span class="required"> *</span>
+                  </strong>
+                </td>
+                <td class="info" style="width: 10px">
+                  <%= text_field_tag :enterprise_name %>
+                </td>
+              </tr>
+            </table>
+        </p>
+      </span>
       <p>
-        <em class="info"><%= "#{l(:label_mail_attention)} " %></em></p>
-
+        <%= f.text_field :mail, :required => true %>
+        <span id="valid_user_mail"></span>
+      </p>
+      <p>
+        <em class="info"><%= "#{l(:label_mail_attention)} " %></em>
+      </p>
       <p><%= f.select :language, lang_options_for_select, :required => true %></p>
-
       <!-- added by bai  增加了身份、性别和地区-->
 
-<span id='gender' style='display:none'>
-<p>
-  <table>
-    <tr>
-      <td class="info" align="right" style="width: 90px">
-        <strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td>
-      <td class="info" style="width: 10px">
-        <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
-	<option value = '1'>#{l(:label_gender_female)}</option>".html_safe %>
-      </td>
-    </tr>
-  </table>
-  </p>
-</span>
-
-
+    <span id='gender' style='display:none'>
+    <p>
+      <table>
+        <tr>
+          <td class="info" align="right" style="width: 90px">
+            <strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td>
+          <td class="info" style="width: 10px">
+            <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
+        <option value = '1'>#{l(:label_gender_female)}</option>".html_safe %>
+          </td>
+        </tr>
+      </table>
+      </p>
+    </span>
       <p>
       <table>
         <tr>
@@ -435,19 +441,13 @@
     </table>
     </p>
 <% end %>
-
 <% if Setting.openid? %>
     <p><%= f.text_field :identity_url %></p>
 <% end %>
-
-
 <% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %>
     <p><%= custom_field_tag_with_label :user, value %></p>
 <% end %>
 </div>
-
-
-
 <script type="text/javascript">
     jQuery(document).ready(function () {
         var $login = $('#user_login')
@@ -486,5 +486,4 @@
             ;
         });
     });
-
 </script>
\ No newline at end of file
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 6d1581820..aae4a63b8 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -56,97 +56,97 @@
             </td>
 			<td colspan="2">
 				<table width="580px" border="0" style="table-layout: fixed">
-          <tr>
-            <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-              <strong>作品名称:</strong>&nbsp;
-              <% if homework.name == nil || homework.name == "" %>
-                  <% homework_filename = homework.user.name + "提交的作业" %>
-              <% else %>
-                  <% homework_filename = homework.name %>
-              <% end %>
-              <strong title="<%=homework_filename%>">
-                <%= link_to homework_filename , homework_attach_path(homework)%>
-              </strong>
-            </td>
-            <td style="vertical-align: top;width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-              <strong>合作成员:&nbsp;</strong>
-                <% homework_users = homework_user_of_homework(homework,is_teacher) %>
-                <% if homework.users.count == 0 %>
-                    无
-                <% else %>
-                  <span title="<%= homework_users%>"><%= homework_users  %></span>
-                <% end %>
-            </td>
-            <td rowspan="4" style="text-align: center;vertical-align: middle;width: 30px">
-              <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %>
-                  <span class="required">迟交</span>
-              <% end %>
-            </td>
-          </tr>
+                  <tr>
+                    <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                      <strong>作品名称:</strong>&nbsp;
+                      <% if homework.name == nil || homework.name == "" %>
+                          <% homework_filename = homework.user.name + "提交的作业" %>
+                      <% else %>
+                          <% homework_filename = homework.name %>
+                      <% end %>
+                      <strong title="<%=homework_filename%>">
+                        <%= link_to homework_filename , homework_attach_path(homework)%>
+                      </strong>
+                    </td>
+                    <td style="vertical-align: top;width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                      <strong>合作成员:&nbsp;</strong>
+                        <% homework_users = homework_user_of_homework(homework,is_teacher) %>
+                        <% if homework.users.count == 0 %>
+                            无
+                        <% else %>
+                          <span title="<%= homework_users%>"><%= homework_users  %></span>
+                        <% end %>
+                    </td>
+                    <td rowspan="4" style="text-align: center;vertical-align: middle;width: 30px">
+                      <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %>
+                          <span class="required">迟交</span>
+                      <% end %>
+                    </td>
+                  </tr>
 
-          <tr>
-            <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-              <strong>开发项目</strong>:&nbsp;
-                  <% if homework.project != nil %>
-                    <span title="<%= homework.project.name %>">
-                      <%= link_to homework.project.name,project_path(homework.project.id)%>
-                    </span>
-                  <% else %>
-                      暂无
-                  <% end %>
-            </td>
-            <td>
-              <strong>项目得分:&nbsp;
-              <span style="color: <%= homework.project.nil? ? "#727272" : "#EC6300"%>;">                  
-                  <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %>
-              </span>
-              </strong>
-            </td>
-          </tr>
+                  <tr>
+                    <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                      <strong>开发项目</strong>:&nbsp;
+                          <% if homework.project != nil %>
+                            <span title="<%= homework.project.name %>">
+                              <%= link_to homework.project.name,project_path(homework.project.id)%>
+                            </span>
+                          <% else %>
+                              暂无
+                          <% end %>
+                    </td>
+                    <td>
+                      <strong>项目得分:&nbsp;
+                      <span style="color: <%= homework.project.nil? ? "#727272" : "#EC6300"%>;">
+                          <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %>
+                      </span>
+                      </strong>
+                    </td>
+                  </tr>
 
-          <tr>
-            <td>
-              <strong>提交文件:&nbsp;
-                <% if is_evaluation  || is_teacher%>
-                  <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%>
-                <% else %>
-                    <span class="required">未开启互评功能作业不允许下载</span>
-                <% end %>
-              </strong>
-            </td>
-            <td>
-              <strong>互评得分:&nbsp;
-                <%# student_homework_score = student_score_for_homework(homework) %>
-                <span style="color:<%= homework.s_score.nil? ? "#727272" : "#EC6300"%>;">
-                  <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %>
-                  <%= score %>
-                </span>&nbsp;&nbsp;
-                <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%>
-                    <%= link_to "学生互评>>",homework_attach_path(homework)  %>
-                <% end %>
-              </strong>
-            </td>
-          </tr>
-					<tr>
-						<td style="vertical-align: top;width: 200px;">
-              <% if is_evaluation || is_teacher%>
-                  <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments}  %>
-              <% end %>
-            </td>
-            <td>
-              <strong>终评得分:&nbsp;
-                <%# totle_homework_score = score_for_homework(homework) %>
-                <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %>
-                <span style="color:<%= totle_homework_score == "0.00"? "#727272" : "#EC6300"%> ;">
-                  <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score  %>
-                  <%= score %>
-                </span>&nbsp;&nbsp;
-                <% if is_teacher %>
-                    <%= link_to "教师评分>>",homework_attach_path(homework)  %>
-                <% end %>
-              </strong>
-            </td>
-					</tr>
+                  <tr>
+                    <td>
+                      <strong>提交文件:&nbsp;
+                        <% if is_evaluation  || is_teacher%>
+                          <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%>
+                        <% else %>
+                            <span class="required">未开启互评功能作业不允许下载</span>
+                        <% end %>
+                      </strong>
+                    </td>
+                    <td>
+                      <strong>互评得分:&nbsp;
+                        <%# student_homework_score = student_score_for_homework(homework) %>
+                        <span style="color:<%= homework.s_score.nil? ? "#727272" : "#EC6300"%>;">
+                          <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %>
+                          <%= score %>
+                        </span>&nbsp;&nbsp;
+                        <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%>
+                            <%= link_to "学生互评>>",homework_attach_path(homework)  %>
+                        <% end %>
+                      </strong>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td style="vertical-align: top;width: 200px;">
+                      <% if is_evaluation || is_teacher%>
+                          <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments}  %>
+                      <% end %>
+                    </td>
+                    <td>
+                      <strong>终评得分:&nbsp;
+                        <%# totle_homework_score = score_for_homework(homework) %>
+                        <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %>
+                        <span style="color:<%= totle_homework_score == "0.00"? "#727272" : "#EC6300"%> ;">
+                          <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score  %>
+                          <%= score %>
+                        </span>&nbsp;&nbsp;
+                        <% if is_teacher %>
+                            <%= link_to "教师评分>>",homework_attach_path(homework)  %>
+                        <% end %>
+                      </strong>
+                    </td>
+                  </tr>
 				</table>
 			</td>
 		</tr>

From f477f45dec2a91387a16be5441054576581655c0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 26 Sep 2014 14:02:44 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_form.html.erb | 49 +++++++++++++------------
 config/locales/zh.yml                   |  3 +-
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 5ba7b9e34..87d31b465 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -1,20 +1,16 @@
 <script type="text/javascript">
     function get_options(value) {
         $.ajax({
-                      type: "POST",
-                      url: '/school/get_options/' + encodeURIComponent(value),
-                      data: 'text',
-                      success: function (data) {
-                          $("#occupation").html(data);
+          type: "POST",
+          url: '/school/get_options/' + encodeURIComponent(value),
+          data: 'text',
+          success: function (data) {
+              $("#occupation").html(data);
 
-                      }
-                  }
-
-        )
+          }
+      })
     }
-</script>
 
-<script type="text/javascript">
     function check() {
         var regex = /^\d*$/;
         if (!regex.test($("#class_period").val())) {
@@ -39,16 +35,17 @@
 <%= f.fields_for @course do |m| %>
     <% unless @course.nil? %>
         <p>
-        <table>
-          <tr>
-            <td>
-              <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
-                <span class="required"> *&nbsp;&nbsp;</span></span>
-              <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %></span>
-              <span>&nbsp;<strong><%= l(:label_class_hour) %></strong></span>
-            </td>
-          </tr>
-        </table></p>
+            <table>
+              <tr>
+                <td>
+                  <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
+                    <span class="required"> *&nbsp;&nbsp;</span></span>
+                  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %></span>
+                  <span>&nbsp;<strong><%= l(:label_class_hour) %></strong></span>
+                </td>
+              </tr>
+            </table>
+        </p>
     <% else %>
         <p>
         <table>
@@ -87,8 +84,9 @@
     </p>
       <p style="margin-left:-10px;">
         <label for="course[course]_password" style="font-size: 13px;"><%= l(:label_new_course_password) %>
-          <span class="required">
-          *</span></label><input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%= @course.password %>" size="60" name="course[password]">
+          <span class="required">*</span>
+        </label>
+        <input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%= @course.password %>" size="60" name="course[password]"/>
       </p>
       <em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
 <% end %>
@@ -103,7 +101,10 @@
   </span>
 </p>
 <p style="margin-left:-10px;">
-  <em style="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %><%= l(:label_course_public_info) %></em>
+  <em style="color: #888888;display: block;font-size: 90%;font-style: normal;">
+    <%= f.check_box :is_public, :style => "margin-left:10px;" %>
+    <%= l(:label_course_public_info) %>
+  </em>
 </p><!-- modified by bai -->
 <p style="display:none;"><%= f.text_field :course_type, :value => 1 %></p>
 <%= wikitoolbar_for 'course_description' %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 27589e5f1..ae8950fc9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2128,4 +2128,5 @@ zh:
   lable_hot_course: 活跃课程
   lable_hot_projects: 热门项目
   lable_user_active: 用户动态
-  lable_bar_active: 贴吧动态
+  lable_bar_active: 贴吧动态
+  lable_student_list_visable: 学生列表是否公开

From 79f3c8efb3625ffe83d7f3012646b29d73d2ea5c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 26 Sep 2014 16:04:17 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20140922032830_change225_bid_data.rb | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 db/migrate/20140922032830_change225_bid_data.rb

diff --git a/db/migrate/20140922032830_change225_bid_data.rb b/db/migrate/20140922032830_change225_bid_data.rb
deleted file mode 100644
index f41ec73c0..000000000
--- a/db/migrate/20140922032830_change225_bid_data.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Change225BidData < ActiveRecord::Migration
-  def up
-    bid = Bid.find 225
-    bid.proportion = 60
-    bid.save
-  end
-
-  def down
-    bid = Bid.find 225
-    bid.proportion = 60
-    bid.save
-  end
-end

From 8aec3fe8f5a8bc1ea7619357dca63359a8071e9c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 27 Sep 2014 15:30:01 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=B9=B4=E4=BB=BD=E4=BB=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=B9=B4=E4=BB=BD=E5=BC=80=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index a005b299b..969fbceae 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -456,8 +456,8 @@ module CoursesHelper
   #课程实践年份下拉框
   def course_time_option
     type = []
-    #work_types = WorksCategory.all
-    for i in (2008..2020)
+    now_year = Time.now.year
+    for i in (now_year..now_year + 10)
       option = []
       option << i
       option << i

From 57835abb3734560644c9ec36f9633008e29e4616 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 27 Sep 2014 16:18:29 +0800
Subject: [PATCH 17/19] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E4=B8=8D=E8=83=BD=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/watchers_helper.rb                |  3 +-
 app/views/courses/settings/_members.html.erb  | 50 ++++++++++++-------
 app/views/layouts/_join_exit_project.html.erb |  4 +-
 config/locales/zh.yml                         |  1 +
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index b05e0b286..793581664 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -251,6 +251,7 @@ module WatchersHelper
   end
 
     def exit_project_link(project)
-      link_to("退出项目",exit_cur_project_path(project.id),:remote => true )
+      link_to(l(:label_exit_project),exit_cur_project_path(project.id),
+        :remote => true, :confirm => l(:lable_sure_exit_project) )
     end
   end
diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb
index d0c77ae83..a62a9c613 100644
--- a/app/views/courses/settings/_members.html.erb
+++ b/app/views/courses/settings/_members.html.erb
@@ -20,26 +20,34 @@
         <% members.each do |member| %>
             <% next if member.new_record? %>
             <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-              <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+              <td class="<%= member.principal.class.name.downcase %>">
+                <%= link_to_user member.principal %>
+              </td>
               <td class="roles">
-    <span id="member-<%= member.id %>-roles">
-      <%= h member.roles.sort.collect(&:to_s).join(', ') %>
-    </span>
-                <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
-                                      :method => :put,
-                                      :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+                <span id="member-<%= member.id %>-roles">
+                  <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+                </span>
+                <%= form_for(member, {:as => :membership, :remote => true, 
+                                      :url => course_memberships_path(member),:method => :put,
+                                      :html => {:id => "member-#{member.id}-roles-form", 
+                                                :class => 'hol'}}
                     ) do |f| %>
-
                     <p>
                       <% roles.each do |role| %>
-                          <label><%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
-                                                   :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> <%= h role %></label><br/>
-                      <% end %></p>
+                          <label>
+                            <%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role),:disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> 
+                            <%= h role %>
+                          </label>
+                          <br/>
+                      <% end %>
+                    </p>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
-                    <p><%= submit_tag l(:button_change), :class => "small" %>
+                    <p>
+                      <%= submit_tag l(:button_change), :class => "small" %>
                       <%= link_to_function l(:button_cancel),
                                            "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
-                      %></p>
+                      %>
+                    </p>
                 <% end %>
               </td>
               <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
@@ -71,8 +79,10 @@
       <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %>
           <fieldset>
             <legend><%= l(:label_member_new) %></legend>
-
-            <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+            <p>
+              <%= label_tag "principal_search", l(:label_principal_search) %>
+              <%= text_field_tag 'principal_search', nil %>
+            </p>
             <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@course, :format => 'js') }')" %>
 
             <div id="principals_for_new_member">
@@ -82,10 +92,12 @@
             <!--show the roles which will select-->
             <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
               <% roles.each do |role| %>
-
-                  <label><%= radio_button_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
-              <% end %></p>
-
+                  <label>
+                    <%= radio_button_tag 'membership[role_ids][]', role.id %> 
+                    <%= h role %>
+                  </label>
+              <% end %>
+            </p>
             <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
           </fieldset>
       <% end %>
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index c43ad55a2..310d4ecd3 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -14,7 +14,9 @@
 
 <!--添加退出项目-->
 <div style="margin-left: 20px;">
-  <% if ((User.current.member_of? @project) && User.current.login?) %>
+  <% if ((User.current.member_of? @project) && 
+    User.current.login? && 
+    @project.members.where("user_id = #{User.current.id}").first.roles.first.to_s != "Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index fe3dd0fe1..e2ed6a045 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2139,3 +2139,4 @@ zh:
   lable_user_active: 用户动态
   lable_bar_active: 贴吧动态
   lable_student_list_visable: 学生列表是否公开
+  lable_sure_exit_project: 是否确认退出该项目

From 27ad49282c442e89898af2dce7fb186b4021cf2f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 27 Sep 2014 16:43:07 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B1=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        | 2 +-
 app/views/layouts/_join_exit_project.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c40ac384a..6770d0c02 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -898,7 +898,7 @@ class ProjectsController < ApplicationController
     @project = Project.find params[:id]
     if  User.current.login?
       members = Member.where(:user_id => User.current.id, :project_id=>params[:id]).first
-      if  members != nil
+      if  members != nil && members.roles.first.to_s != "Manager"
         members.destroy
       end
       respond_to do |format|
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 310d4ecd3..a2b928e15 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -16,7 +16,7 @@
 <div style="margin-left: 20px;">
   <% if ((User.current.member_of? @project) && 
     User.current.login? && 
-    @project.members.where("user_id = #{User.current.id}").first.roles.first.to_s != "Manager") %>
+    Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s != "Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
 </div>
\ No newline at end of file

From 045a09e2ed6bfe4c9b6fb94b26b21a876c32a86b Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sun, 28 Sep 2014 11:31:12 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8B=E8=BD=BD=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 22 +++++++++++++++++++++
 app/controllers/attachments_controller.rb |  2 +-
 config/locales/zh.yml                     |  5 ++++-
 db/schema.rb                              | 24 +++++++++++------------
 lib/redmine.rb                            |  7 +++++--
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4f731e580..0b4309ef5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -254,6 +254,28 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
+    if @attachment.container_type == "Memo"
+      allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
+    elsif  @attachment.container_type == "Project"
+
+    elsif @attachment.container_type == "course"
+
+    elsif @attachment.container_type == "contest"
+
+    end
+
+    if allowed
+      true
+    else
+      if @project && @project.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    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
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 2d5149c09..7ce9646c6 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -21,7 +21,7 @@ class AttachmentsController < ApplicationController
   before_filter :file_readable, :read_authorize, :only => [:show, :thumbnail]#Modified by young
   before_filter :delete_authorize, :only => :destroy
   before_filter :authorize_global, :only => :upload
-  
+  before_filter :authorize_attachment_download, :only => :download
   before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
   require 'iconv'
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index fe3dd0fe1..fe7106d22 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -492,7 +492,10 @@ zh:
   permission_select_contest_modules: 选择竞赛模块
   permission_manage_contestnotifications: 管理竞赛通知
   permission_notificationcomment_contestnotifications: 添加竞赛通知评论
-
+  permission_memos_attachments_download: 下载贴吧附件
+  permission_projects_attachments_download: 项目附件下载
+  permission_course_attachments_download: 课程附件下载
+  permission_contest_attachments_download: 竞赛附件下载
 
   project_module_issue_tracking: 问题跟踪
   project_module_time_tracking: 时间跟踪
diff --git a/db/schema.rb b/db/schema.rb
index 817104aa9..e13ff4942 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140922032830) do
+ActiveRecord::Schema.define(:version => 20140916005319) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -437,9 +437,9 @@ ActiveRecord::Schema.define(:version => 20140922032830) do
     t.string   "web_title"
     t.string   "title"
     t.text     "description"
-    t.string   "page_type"
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
+    t.string   "page_type"
     t.integer  "sort_type"
     t.integer  "image_width",  :default => 107
     t.integer  "image_height", :default => 63
@@ -878,18 +878,18 @@ ActiveRecord::Schema.define(:version => 20140922032830) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
diff --git a/lib/redmine.rb b/lib/redmine.rb
index e0a14c7e9..c96464abc 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -113,7 +113,10 @@ Redmine::AccessControl.map do |map|
   map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_course => true
   map.permission :select_course_modules, {:courses => :modules}, :require => :member  ,:belong_to_course => true
   map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true  ,:belong_to_course => true
-
+  map.permission :memos_attachments_download,{:attachments => :download}
+  map.permission :projects_attachments_download,{:attachments => :download},:belong_to_project => true
+  map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true
+  map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true
   #与项目一致，注释掉
   #map.course_module :files do |map|
   #  map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
@@ -125,7 +128,7 @@ Redmine::AccessControl.map do |map|
   #  map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true
   #  map.permission :comment_news, {:comments => :create}
   #  end
-  #作业模块权限
+
   map.course_module :bids do |map|
     map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true
     map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true