qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
sw 2015-06-08 15:57:40 +08:00
parent da9a607a5b 8375332f4d
commit 0ba7b68e1a
4 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/models/mailer.rb
View File

@ -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在课程。项目中发布的讨论帖子
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 m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
# 查询user在课程中发布的讨论帖子
course_mesages = Message.find_by_sql("select me.* from messages me, boards b, members m where
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?
messages.each do |msg|
if msg.project
@project_messages << msg
elsif msg.course
@course_messages << msg
end
unless course_mesages.first.nil?
course_mesages.each do |msg|
@course_messages << msg
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

19
public/assets/kindeditor/kindeditor.js
View File

@ -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'){
pdiv = $("#define")
}else if($("#full").css('display') == 'block'){
pdiv = $("#full")
}
// if($("#define").css('display') == 'block'){
// pdiv = $("#define")
// }else if($("#full").css('display') == 'block'){
// 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() {

17
public/assets/kindeditor/plugins/less/less.js
View File

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

17
public/assets/kindeditor/plugins/more/more.js
View File

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