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

app/controllers/student_work_controller.rb

@@ -133,8 +133,9 @@ class StudentWorkController < ApplicationController
       format.js
       format.html
       format.xls {
+        filename = "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_homework_list)}.xls"
         send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_homework_list)}.xls")
+                  :filename => filename_for_content_disposition(filename))
       }
     end
   end
@@ -386,8 +387,9 @@ class StudentWorkController < ApplicationController
     end
     respond_to do |format|
       format.xls {
+        filename = "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_absence_list)}.xls"
         send_data(absence_penalty_list_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_absence_list)}.xls")
+                  :filename => filename_for_content_disposition(filename))
       }
     end
   end
@@ -396,8 +398,9 @@ class StudentWorkController < ApplicationController
   def evaluation_list
     respond_to do |format|
       format.xls {
+        filename = "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_evaluation_list)}.xls"
         send_data(evaluation_list_xls(@homework.student_works), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_evaluation_list)}.xls")
+                  :filename => filename_for_content_disposition(filename))
       }
     end
   end

app/views/layouts/_new_feedback.html.erb

@@ -22,7 +22,7 @@
           <% end %>
         </div>
         <div class="mt5">
-          <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #15BCCF;">
+          <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">
             <%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
         </div>
       </div>

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150917022239) do
+ActiveRecord::Schema.define(:version => 20150930011457) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -497,26 +497,23 @@ ActiveRecord::Schema.define(:version => 20150917022239) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :primary_key => "Num", :force => true do |t|
+  create_table "dts", :force => true do |t|
-    t.string   "Defect",        :limit => 50
+    t.string   "IPLineCode"
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    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.string   "Num"
-    t.text     "TraceInfo",     :limit => 2147483647
+    t.string   "Variable"
-    t.text     "Code",          :limit => 2147483647
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
     t.integer  "project_id"
-    t.datetime "created_at"
+    t.datetime "created_at",    :null => false
-    t.datetime "updated_at"
+    t.datetime "updated_at",    :null => false
-    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -575,6 +572,8 @@ ActiveRecord::Schema.define(:version => 20150917022239) do
     t.integer  "viewed"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
   end
 
   create_table "forums", :force => true do |t|
@@ -783,16 +782,6 @@ ActiveRecord::Schema.define(:version => 20150917022239) 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"
@@ -911,6 +900,7 @@ ActiveRecord::Schema.define(:version => 20150917022239) do
     t.datetime "updated_on",                       :null => false
     t.boolean  "locked",        :default => false
     t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
@@ -1318,9 +1308,9 @@ ActiveRecord::Schema.define(:version => 20150917022239) do
 
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
+    t.integer  "status"
-    t.datetime "updated_at",                     :null => false
+    t.datetime "created_at",      :null => false
-    t.integer  "status",          :default => 9
+    t.datetime "updated_at",      :null => false
     t.text     "results"
     t.text     "src"
   end
@@ -1376,6 +1366,7 @@ ActiveRecord::Schema.define(:version => 20150917022239) do
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
     t.text     "description"
+    t.string   "subject"
   end
 
   create_table "taggings", :force => true do |t|
@@ -1567,6 +1558,7 @@ ActiveRecord::Schema.define(:version => 20150917022239) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
+    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb

@@ -13,7 +13,7 @@ class Kindeditor::AssetsController < ApplicationController
           logger.warn '========= Warning: the owner_id is 0, "delete uploaded files automatically" will not work. =========' if defined?(logger) && @asset.owner_id == 0
           @asset.asset_type = @dir
           if @asset.save
-            render :text => ({:error => 0, :url => "http://"+Setting.host_name + "/" + @asset.asset.url,:asset_id => @asset.id}.to_json)
+            render :text => ({:error => 0, :url => @asset.asset.url,:asset_id => @asset.id}.to_json)
           else
             show_error(@asset.errors.full_messages)
           end

public/assets/kindeditor/pasteimg.js

@@ -277,7 +277,10 @@ https://github.com/layerssss/paste.js
                         if (!img["_paste_marked_" + timespan]) {
                             cb(img.src);
                         }
-                        _results.push($(img).remove());
+                        //firefox问题处理，因为采用了 pastableContenteditable 模式，故只需要删除默认的粘贴
+                        if ($(img).attr('src').startsWith('data:image/')) {
+                           _results.push($(img).remove()); 
+                        };
                     }
                     return _results;
                 };
@@ -290,10 +293,9 @@ https://github.com/layerssss/paste.js
 
 }).call(this);
 
-function enablePasteImg(_editor) {
+KindEditor.plugin('paste', function(K) {
-    var editor = _editor,
+    var editor = this,
         name = 'paste';
-    //这样貌似多编辑器就不会冲突了
     if(editor.edit == undefined || editor.edit.iframe == undefined){
         return;
     }
@@ -329,7 +331,6 @@ function enablePasteImg(_editor) {
         console.log("dataURL: " + data.dataURL);
         console.log("width: " + data.width);
         console.log("height: " + data.height);
-        console.log(data.blob);
         var blob = dataURItoBlob(data.dataURL);
         if (data.blob !== null) {
             var data = new FormData();
@@ -342,6 +343,7 @@ function enablePasteImg(_editor) {
               data: data,
               processData: false,
               success: function(data) {
+                console.log(data);
                 editor.exec('insertimage', JSON.parse(data).url);
               }
             });
@@ -349,37 +351,5 @@ function enablePasteImg(_editor) {
 
     });
     return;
-    contentWindow.document.getElementsByTagName('body')[0].onpaste = function(event) {
+    
-        // use event.originalEvent.clipboard for newer chrome versions
+});
-        var items = (event.clipboardData || event.originalEvent.clipboardData).items;
-        console.log(JSON.stringify(items)); // will give you the mime types
-        // find pasted image among pasted items
-        var blob = null;
-        for (var i = 0; i < items.length; i++) {
-            if (items[i].type.indexOf("image") === 0) {
-                blob = items[i].getAsFile();
-            }
-        }
-        // load image if there is a pasted image
-        if (blob !== null) {
-            var reader = new FileReader();
-            reader.onload = function(event) {
-                console.log(event.target.result); // data url!
-                var data = new FormData();
-                data.append("imgFile", blob, "imageFilename.png");
-                console.log(blob);
-                $.ajax({
-                    url: '/kindeditor/upload?dir=image',
-                    contentType: false,
-                    type: 'POST',
-                    data: data,
-                    processData: false,
-                    success: function(data) {
-                        editor.exec('insertimage', JSON.parse(data).url);
-                    }
-                });
-            };
-            reader.readAsDataURL(blob);
-        }
-    }
-};

public/assets/kindeditor/plugins/paste/paste.js

@@ -277,7 +277,10 @@ https://github.com/layerssss/paste.js
                         if (!img["_paste_marked_" + timespan]) {
                             cb(img.src);
                         }
-                        _results.push($(img).remove());
+                        //firefox问题处理，因为采用了 pastableContenteditable 模式，故只需要删除默认的粘贴
+                        if ($(img).attr('src').startsWith('data:image/')) {
+                           _results.push($(img).remove()); 
+                        };
                     }
                     return _results;
                 };
@@ -293,7 +296,6 @@ https://github.com/layerssss/paste.js
 KindEditor.plugin('paste', function(K) {
     var editor = this,
         name = 'paste';
-    //这样貌似多编辑器就不会冲突了
     if(editor.edit == undefined || editor.edit.iframe == undefined){
         return;
     }
@@ -329,7 +331,6 @@ KindEditor.plugin('paste', function(K) {
         console.log("dataURL: " + data.dataURL);
         console.log("width: " + data.width);
         console.log("height: " + data.height);
-        console.log(data.blob);
         var blob = dataURItoBlob(data.dataURL);
         if (data.blob !== null) {
             var data = new FormData();
@@ -342,6 +343,7 @@ KindEditor.plugin('paste', function(K) {
               data: data,
               processData: false,
               success: function(data) {
+                console.log(data);
                 editor.exec('insertimage', JSON.parse(data).url);
               }
             });
@@ -349,37 +351,5 @@ KindEditor.plugin('paste', function(K) {
 
     });
     return;
-    contentWindow.document.getElementsByTagName('body')[0].onpaste = function(event) {
+    
-        // use event.originalEvent.clipboard for newer chrome versions
-        var items = (event.clipboardData || event.originalEvent.clipboardData).items;
-        console.log(JSON.stringify(items)); // will give you the mime types
-        // find pasted image among pasted items
-        var blob = null;
-        for (var i = 0; i < items.length; i++) {
-            if (items[i].type.indexOf("image") === 0) {
-                blob = items[i].getAsFile();
-            }
-        }
-        // load image if there is a pasted image
-        if (blob !== null) {
-            var reader = new FileReader();
-            reader.onload = function(event) {
-                console.log(event.target.result); // data url!
-                var data = new FormData();
-                data.append("imgFile", blob, "imageFilename.png");
-                console.log(blob);
-                $.ajax({
-                    url: '/kindeditor/upload?dir=image',
-                    contentType: false,
-                    type: 'POST',
-                    data: data,
-                    processData: false,
-                    success: function(data) {
-                        editor.exec('insertimage', JSON.parse(data).url);
-                    }
-                });
-            };
-            reader.readAsDataURL(blob);
-        }
-    }
 });

public/javascripts/init_activity_KindEditor.js

@@ -26,7 +26,7 @@ function init_editor(params){
             if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
                 params.submit_btn.hide();
                 this.resize("95%", null);
-            }else if(edit.html().val().trim() != ""){
+            }else if(this.edit.html().trim() != ""){
                 params.submit_btn.show();
             }