Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/files_controller.rb

@@ -24,7 +24,7 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield]
 
   helper :sort
   include SortHelper

app/helpers/application_helper.rb

@@ -2727,6 +2727,10 @@ int main(int argc, char** argv){
     opt = {enable_at: false, prettify: false, init_activity: false}.merge default_opt
     ss  = ''
 
+    unless Setting.at_enabled?
+      opt[:enable_at] = false
+    end
+
     ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
     if opt[:enable_at]
       ss += javascript_include_tag('/assets/kindeditor/at/jquery.caret.min.js', '/assets/kindeditor/at/jquery.atwho.js', '/assets/kindeditor/at/config.js')

app/helpers/project_score_helper.rb

@@ -22,7 +22,9 @@ module ProjectScoreHelper
 
   #代码提交数量
   def changesets_num project
-    # commit_count(project)
+    # g = Gitlab.client
+    # project.gpid.nil? ? 0 : g.commits_total_count(project.gpid)
+    # commits_total_count(project.gpid)
     project.changesets.count
   end
 

app/views/issues/_list.html.erb

@@ -18,7 +18,7 @@
          }
 
          $(function () {
-             init_activity_KindEditor_data(<%= issue.id%>, null, "87%");
+             init_activity_KindEditor_data(<%= issue.id%>, null, "87%", "<%= issue.class.name %>");
              showNormalImage('activity_description_<%= issue.id %>');
              if ($("#intro_content_<%= issue.id %>").height() > 360) {
                  $("#intro_content_show_<%= issue.id %>").show();

app/views/issues/show.html.erb

@@ -1,9 +1,9 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false) %>
+    <%= import_ke(enable_at: true) %>
     <%= javascript_include_tag 'create_kindeditor'%>
 <% end %>
 <script>
-    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
 </script>
 <script type="text/javascript">
     $(function(){

app/views/repositories/show.html.erb

@@ -27,7 +27,7 @@
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
       <% if User.current.id != @project.user_id %>
-          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"确认要fork该项目吗？" %>
+          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
             <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
           </div>
       <% end %>

app/views/users/_course_journalsformessage.html.erb

@@ -26,7 +26,7 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count=course.journals_for_messages.where('m_parent_id IS NULL').count %>
+  <% count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
     <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
     <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
@@ -47,7 +47,7 @@
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <ul>
-            <% course.journals_for_messages.where('m_parent_id IS NULL').reorder("created_on desc").each do |comment| %>
+            <% fetch_user_leaveWord_reply(activity).each do |comment| unless fetch_user_leaveWord_reply(activity).nil? %>
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
@@ -68,43 +68,12 @@
                       <%= format_time(comment.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                    <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
-                        <script type="text/javascript">
-                            $(function(){
-                                showNormalImage('reply_to_content_<%= reply.id %>');
-                            });
-                        </script>
-                        <div class="recall">
-                          <div class="homepagePostReplyPortrait">
-                            <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.user_id), :alt => "用户头像" %>
-                          </div>
-                          <div class="homepagePostReplyjournal">
-                              <div class="homepagePostReplyPublisher">
-                                <% if reply.try(:user).try(:realname) == ' ' %>
-                                    <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                                <% else %>
-                                    <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                                <% end %>
-                                <%= l(:label_reply_to)%>
-                                <% if comment.try(:user).try(:realname) == ' ' %>
-                                    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14 ml10" %>
-                                <% else %>
-                                    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14 ml10" %>
-                                <% end %>
-                                <%= format_time reply.created_on %>
-                              </div>
-                            <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
-                              <%= reply.notes.html_safe %></div>
-                              <div class="cl"></div>
-                          </div>
-                          <div class="cl"></div>
-                        </div>
-                      <% end %>
-                    <% end %>
+                      <%= comment.notes.html_safe %>
+                    </div>
                   </div>
                   <div class="cl"></div>
                 </li>
+              <% end %>
             <% end %>
           </ul>
         </div>
@@ -114,7 +83,7 @@
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
               <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
               <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
               <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
@@ -132,4 +101,5 @@
       <div class="cl"></div>
     </div>
   </div>
-</div>
+</div>
+

config/settings.yml

@@ -279,3 +279,5 @@ plugin_redmine_ckeditor:
   toolbar_can_collapse: '0'
   toolbar_location: top
   toolbar: Source,ShowBlocks,--,Undo,Redo,-,Find,Replace,--,Bold,Italic,Underline,Strike,-,Subscript,Superscript,-,NumberedList,BulletedList,-,Outdent,Indent,Blockquote,-,JustifyLeft,JustifyCenter,JustifyRight,JustifyBlock,-,Link,Unlink,-,richImage,Table,HorizontalRule,/,Styles,Format,Font,FontSize,-,TextColor,BGColor
+at_enabled:
+  default: 1

db/schema.rb

@@ -558,23 +558,26 @@ ActiveRecord::Schema.define(:version => 20151218022014) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
   end
 
   create_table "editor_of_documents", :force => true do |t|
@@ -923,16 +926,6 @@ ActiveRecord::Schema.define(:version => 20151218022014) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"

public/assets/kindeditor/at/config.js

@@ -10,10 +10,11 @@ var enableAt = function(_editor) {
     var ifr = editor.edit.iframe[0];
     var doc = ifr.contentDocument || iframe.contentWindow.document;
     var ifrBody = doc.body;
-    ifrBody.contentEditable = true;
+    //ifrBody.contentEditable = false;
+    $(ifrBody).attr('enable_at', 'true');
     console.log("enable at");
 
-    $.fn.atwho.debug = true;
+    //$.fn.atwho.debug = true;
 
 
     var names = [];
@@ -41,6 +42,6 @@ var enableAt = function(_editor) {
     };
 
     $inputor = $(ifrBody).atwho(at_config);
-    $inputor.caret('pos', 47);
-    $inputor.focus().atwho('run');
+    //$inputor.caret('pos', 47);
+    //$inputor.focus().atwho('run');
 };

public/assets/kindeditor/at/jquery.atwho.js

@@ -97,7 +97,7 @@ App = (function() {
 
   App.prototype.reg = function(flag, setting) {
     var base, controller;
-    controller = (base = this.controllers)[flag] || (base[flag] = this.$inputor.is('[contentEditable]') ? new EditableController(this, flag) : new TextareaController(this, flag));
+    controller = (base = this.controllers)[flag] || (base[flag] = this.$inputor.is('[enable_at]') ? new EditableController(this, flag) : new TextareaController(this, flag));
     if (setting.alias) {
       this.aliasMaps[setting.alias] = flag;
     }
@@ -1110,7 +1110,7 @@ $.fn.atwho = function(method) {
   var _args, result;
   _args = arguments;
   result = null;
-  this.filter('textarea, input, [contenteditable=""], [contenteditable=true]').each(function() {
+  this.filter('textarea, input, [contenteditable=""], [contenteditable=true], [enable_at=true]').each(function() {
     var $this, app;
     if (!(app = ($this = $(this)).data("atwho"))) {
       $this.data('atwho', (app = new App(this)));

public/assets/kindeditor/kindeditor.js

@@ -260,7 +260,7 @@ K.options = {
 	bodyClass : 'ke-content',
 	indentChar : '\t',
 	cssPath : K.basePath +'plugins/code/previewcode.css',
-	cssData : '',
+	cssData : 'font{color:black;}',
 	minWidth : 650,
 	minHeight : 100,
 	minChangeSize : 1,

public/javascripts/create_kindeditor.js

@@ -3,6 +3,7 @@ function sd_create_editor(params){
     // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var id = arguments[1] ? arguments[1] : undefined;
+    var type = arguments[2] ? arguments[2] : '';
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
     var editor = params.kindutil.create(params.textarea, {
@@ -74,7 +75,9 @@ function sd_create_editor(params){
             edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
             this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
-
+            if(typeof enableAt === 'function'){
+                enableAt(this, id, type);
+            }
         }
     }).loadPlugin('paste');
     return editor;
@@ -136,6 +139,7 @@ function sd_reset_editor_form(params){
 function sd_create_editor_from_data(id){
     var height = arguments[1] ? arguments[1] : undefined;
     var width = arguments[2] ? arguments[2] : undefined;
+    var type = arguments[3] ? arguments[3] : undefined;
     KindEditor.ready(function (K) {
         $("div[nhname='new_message_" + id + "']").each(function () {
             var params = {};
@@ -153,7 +157,7 @@ function sd_create_editor_from_data(id){
             params.height = height;
             params.width = width;
             if (params.textarea.data('init') == undefined) {
-                params.editor = sd_create_editor(params,id);
+                params.editor = sd_create_editor(params,id, type);
                 sd_create_form(params);
                 params.cancel_btn.click(function () {
                     sd_reset_editor_form(params);

public/javascripts/init_activity_KindEditor.js

@@ -153,7 +153,7 @@ function init_activity_KindEditor_data(id){
                 params.cancel_btn.click(function () {
                     nh_reset_form(params);
                 });
-                params.submit_btn.click(function () {
+                params.submit_btn.one('click',function () {
                     params.form.submit();
                 });
                 params.textarea.data('init', 1);