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

app/controllers/projects_controller.rb

@@ -747,7 +747,7 @@ class ProjectsController < ApplicationController
 
   def update
     @project.safe_attributes = params[:project]
-    @project.dts_test = params[:project][:dts_test]
+    #@project.dts_test = params[:project][:dts_test]
     if validate_parent_id && @project.save
       @course = Course.find_by_extra(@project.identifier)
       unless @course.nil?

app/views/projects/_form.html.erb

@@ -15,9 +15,11 @@
 <!-- <p style="margin-left:-10px;"><%#= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> -->  <!-- by huang -->
 <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;" %></em></p>
 <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :hidden_repo, :style => "margin-left:10px;" %></em></p>
+<!--
 <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;">
-  <%= f.check_box :dts_test, :style => "margin-left:10px;" %>
+  <%#= f.check_box :dts_test, :style => "margin-left:10px;" %>
 </em></p>
+-->
 <p style="display:none;"><%= f.text_field :project_type, :value => 0 %></p>
 
 <%= wikitoolbar_for 'project_description' %>

app/views/projects/_tools_expand.html.erb

@@ -16,7 +16,7 @@
     <li><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %></li>
   </ul>
   <ul><h3>其他工具</h3>
-    <% if @project.dts_test == 1 %>
+    <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %>
         <li><%= link_to l(:label_module_share) ,share_show_path(@project) %></li>
     <% end %>
     <li><%= link_to l(:project_module_documents), project_documents_path(@project) %></li>

config/locales/zh.yml

@@ -506,6 +506,7 @@ zh:
   project_module_calendar: 日历
   project_module_gantt: 甘特图
   project_module_course: 课程
+  project_module_dts: DTS测试工具
   label_module_share: DTS测试工具
 
   label_user: 用户

config/settings.yml

@@ -177,6 +177,7 @@ default_projects_modules:
   - calendar
   - gantt
   - course
+  - dts
 default_projects_tracker_ids:
   serialized: true
   default: 

db/schema.rb

@@ -866,18 +866,18 @@ ActiveRecord::Schema.define(:version => 20140728014933) 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",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :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"

lib/redmine.rb

@@ -244,6 +244,9 @@ Redmine::AccessControl.map do |map|
     map.permission :view_gantt, {:gantts => [:show, :update]}, :read => true
   end
 
+  map.project_module :dts do |map|
+    map.permission :do_dts, {:dts => :show}, :read => true
+  end
   # map.project_module :journals do |map|
   #   map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true
   # end

lib/redmine/access_control.rb

@@ -67,6 +67,7 @@ module Redmine
       def available_project_modules
         @available_project_modules ||= @permissions.collect(&:project_module).uniq.compact
       end
+
       def available_contest_modules
         @available_contest_modules ||= @permissions.collect(&:contest_module).uniq.compact
       end