Merge branch 'szzh' into develop

app/models/mailer.rb

@@ -107,6 +107,7 @@ class Mailer < ActionMailer::Base
      and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc"
     @issues = Issue.find_by_sql(sql)
 
+
     # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
     # @attachments查询课程课件更新
     @attachments ||= []
@@ -125,21 +126,29 @@ class Mailer < ActionMailer::Base
     # user 提交的作业
     # @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
 
-    # 查询user在课程。项目中发布的讨论帖子
+    # 查询user在课程中发布的讨论帖子
-    messages = Message.find_by_sql("select me.* from messages me, boards b, members m where
+    course_mesages = Message.find_by_sql("select me.* from messages me, boards b, members m where
-     b.id = me.board_id and b.project_id = m.project_id and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     b.id = me.board_id and b.course_id = m.course_id
+     and b.course_id is not Null and m.user_id = '#{user.id}'
+     and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    # 查询user在项目中发布的讨论帖子
+    project_messages = Message.find_by_sql("select me.* from messages me, boards b, members m where
+     b.id = me.board_id and b.project_id = m.project_id
+     and b.project_id != '-1' and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     # messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     @course_messages ||= []
     @project_messages ||= []
-    unless messages.first.nil?
+    unless course_mesages.first.nil?
-      messages.each do |msg|
+      course_mesages.each do |msg|
-        if msg.project
+        @course_messages << msg
-          @project_messages << msg
-        elsif msg.course
-          @course_messages << msg
-        end
       end
     end
+    unless project_messages.first.nil?
+      project_messages.each do |msg|
+        @project_messages << msg
+      end
+    end
+    # wiki
 
     #  查询user在课程中发布的通知，项目中发的新闻
     @course_news = (course_ids && !course_ids.empty?) ? News.find_by_sql("select DISTINCT n.*  from news n

public/assets/kindeditor/kindeditor.js

@@ -3909,14 +3909,22 @@ _extend(KToolbar, KWidget, {
 		});
 	},
 	get : function(name) {
+		//if(this._itemMap[name])return this._itemMap[name];
+		//return this._itemMap[name]=K("span.ke-icon-"+name,this.div).parent()
 //		if (this._itemMap[name]) {
 //			return this._itemMap[name];
 //		}
-        if($("#define").css('display') == 'block'){
+//        if($("#define").css('display') == 'block'){
-            pdiv = $("#define")
+//            pdiv = $("#define")
-        }else if($("#full").css('display') == 'block'){
+//        }else if($("#full").css('display') == 'block'){
-            pdiv = $("#full")
+//            pdiv = $("#full")
-        }
+//        }
+		var container = this.div;
+		if(!$("#define",container).is(':hidden')){
+			pdiv = $("#define",container);
+		}else if(!$("#full",container).is(':hidden')){
+			pdiv = $("#full",container);
+		}
 		return (this._itemMap[name] = K('span.ke-icon-' + name, pdiv).parent());
 	},
 	select : function(name) {
@@ -4865,6 +4873,7 @@ KEditor.prototype = {
 			});
 			return self;
 		}
+		//if(name=='more')alert(fn);
 		return self.handler(key, fn);
 	},
 	updateState : function() {

public/assets/kindeditor/plugins/less/less.js

@@ -2,13 +2,16 @@ KindEditor.plugin('less', function(K) {
     var self = this, name = 'less';
     self.plugin.less = {
         click : function(){
-            if($("#define").css('display') == 'block'){
+            var container = self.toolbar.div;
-                $("#define").css('display','none')
+            $("#full",container).hide();
-                $("#full").css('display','block')
+            $("#define",container).show();
-            }else if($("#full").css('display') == 'block'){
+            //if($("#define").css('display') == 'block'){
-                $("#full").css('display','none')
+            //    $("#define").css('display','none')
-                $("#define").css('display','block')
+            //    $("#full").css('display','block')
-            }
+            //}else if($("#full").css('display') == 'block'){
+            //    $("#full").css('display','none')
+            //    $("#define").css('display','block')
+            //}
         }
     }
     self.clickToolbar(name,self.plugin.less.click)

public/assets/kindeditor/plugins/more/more.js

@@ -2,13 +2,16 @@ KindEditor.plugin('more', function(K) {
     var self = this, name = 'more';
     self.plugin.more = {
         click : function(){
-            if($("#define").css('display') == 'block'){
+            var container = self.toolbar.div;
-                $("#define").css('display','none')
+            $("#define",container).hide();
-                $("#full").css('display','block')
+            $("#full",container).show();
-            }else if($("#full").css('display') == 'block'){
+            //if($("#define").css('display') == 'block'){
-                $("#full").css('display','none')
+            //    $("#define").css('display','none')
-                $("#define").css('display','block')
+            //    $("#full").css('display','block')
-            }
+            //}else if($("#full").css('display') == 'block'){
+            //    $("#full").css('display','none')
+            //    $("#define").css('display','block')
+            //}
         }
     }
     self.clickToolbar(name,self.plugin.more.click)