From 243062bee283059db9410993a8f25cec97b49c65 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 19 Feb 2017 10:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A1=B9=E7=9B=AEmodule?=
 =?UTF-8?q?=E4=B8=AD=E2=80=9C=E5=AE=9E=E8=AE=AD=E9=A1=B9=E7=9B=AE=E2=80=9D?=
 =?UTF-8?q?=E5=92=8C"issue=E2=80=9D=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=EF=BC=8C=E5=8F=AA=E9=80=89=E4=B8=AD=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/settings/_new_modules.html.erb   | 51 ++++++++-------
 db/schema.rb                                  | 62 +++++++------------
 2 files changed, 49 insertions(+), 64 deletions(-)

diff --git a/app/views/projects/settings/_new_modules.html.erb b/app/views/projects/settings/_new_modules.html.erb
index 6413823c5..b1f9718f7 100644
--- a/app/views/projects/settings/_new_modules.html.erb
+++ b/app/views/projects/settings/_new_modules.html.erb
@@ -2,8 +2,8 @@
   <h2 class="pro_newsetting_title">请选择此项目可以使用的模块：</h2>
     <%= form_for @project,:url => { :action => 'modules', :id => @project },:html => {:id => 'modules-form',:method => :post} do |f| %>
         <% Redmine::AccessControl.available_project_modules.each do |m| %>
-        <li class="clear ">
-            <%= check_box_tag('enabled_module_names[]', m, @project.module_enabled?(m), :class=>"fl mt8").html_safe -%>
+        <li class="clear">
+            <%= check_box_tag('enabled_module_names[]', m, @project.module_enabled?(m), :class=>"fl mt8", :id => 'project_module_'+m.to_s ).html_safe -%>
             <p class="fl  ml5"><%= l_or_humanize(m, :prefix => "project_module_").html_safe %></p>
         </li>
         <% end %>
@@ -16,27 +16,26 @@
   </li>
 </ul>
 
-
-<!--h2 class="c_blue mb10">请选择此项目可以使用的模块：</h2>
-<%#= form_for @project,:url => { :action => 'modules', :id => @project },:html => {:id => 'modules-form',:method => :post} do |f| %>
-    <div class="box pl15">
-      <ul>
-          <%# Redmine::AccessControl.available_project_modules.each do |m| %>
-            <li>
-              <label>
-                <%#= check_box_tag('enabled_module_names[]', m, @project.module_enabled?(m)).html_safe -%>
-                <%#= l_or_humanize(m, :prefix => "project_module_").html_safe %>
-              </label>
-            </li>
-          <%# end %>
-      </ul>
-    </div><!--box end-->
-    <!--p class="mb10 c_grey">
-      <#%= check_all_links('modules-form').html_safe %>
-    </p>
-    <p>
-      <a href="javascript:void(0)" class="blue_btn" onclick="$('#modules-form').submit();">
-        <%#= l(:button_save) %>
-      </a>
-    </p>
-<%# end %>-->
+<script>
+    $(function(){
+        if($("#project_module_issue_tracking").is(":checked")){
+            $("#project_module_training_tasks").attr('disabled', 'disabled')
+        }else if($("#project_module_training_tasks").is(":checked")){
+            $("#project_module_issue_tracking").attr('disabled', 'disabled');
+        }
+        $("#project_module_issue_tracking").on('click', function(){
+            if($("#project_module_issue_tracking").is(":checked")) {
+                $("#project_module_training_tasks").attr('disabled', 'disabled');
+            }else{
+                $("#project_module_training_tasks").removeAttr('disabled');
+            }
+        });
+        $("#project_module_training_tasks").on('click', function(){
+            if($("#project_module_training_tasks").is(":checked")){
+                $("#project_module_issue_tracking").attr('disabled', 'disabled');
+            }else {
+                $("#project_module_issue_tracking").removeAttr('disabled');
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 6b7ab2ef1..662251467 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -521,13 +521,6 @@ ActiveRecord::Schema.define(:version => 20170217104309) do
   add_index "contest_messages", ["contest_id"], :name => "index_contest_messages_on_contest_id"
   add_index "contest_messages", ["user_id"], :name => "index_contest_messages_on_user_id"
 
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "contestant_for_contests", :force => true do |t|
     t.integer  "student_id"
     t.integer  "contest_id"
@@ -595,37 +588,6 @@ ActiveRecord::Schema.define(:version => 20170217104309) do
   add_index "contestant_works", ["user_id"], :name => "index_contestant_works_on_user_id"
   add_index "contestant_works", ["work_id"], :name => "index_contestant_works_on_work_id"
 
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
   create_table "contests", :force => true do |t|
     t.integer  "user_id"
     t.string   "name"
@@ -1192,6 +1154,19 @@ ActiveRecord::Schema.define(:version => 20170217104309) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "ii", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+    t.string   "sonar_name"
+  end
+
   create_table "innodb_monitor", :id => false, :force => true do |t|
     t.integer "a"
   end
@@ -2291,6 +2266,17 @@ ActiveRecord::Schema.define(:version => 20170217104309) do
     t.integer "fields_bits",                 :default => 0
   end
 
+  create_table "training_tasks", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.string   "subject"
+    t.text     "description"
+    t.datetime "created_at",                              :null => false
+    t.datetime "updated_at",                              :null => false
+    t.integer  "author_id"
+    t.integer  "status",      :limit => 1, :default => 1
+  end
+
   create_table "user_actions", :force => true do |t|
     t.integer  "user_id"
     t.string   "action_type"