jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
huang 2016-06-03 08:59:09 +08:00
parent 0eb6dbe48a 184c17d52f
commit a71c4a50bb
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/blog_comment.rb
View File

@ -21,7 +21,7 @@ class BlogComment < ActiveRecord::Base
after_save :add_user_activity after_save :add_user_activity
after_update :update_activity after_update :update_activity
after_create :update_parent_time, :blog_wechat_message after_create :update_parent_time
before_destroy :destroy_user_activity before_destroy :destroy_user_activity
scope :like, lambda {|arg| scope :like, lambda {|arg|

2
app/models/homework_common.rb
View File

@ -30,7 +30,7 @@ class HomeworkCommon < ActiveRecord::Base
:author => :author, :author => :author,
:url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}} :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
after_create :act_as_activity, :send_mail,:act_as_course_message after_create :act_as_activity, :send_mail,:act_as_course_message
after_update :update_activity, :wechat_message after_update :update_activity
after_save :act_as_course_activity after_save :act_as_course_activity
after_destroy :delete_kindeditor_assets after_destroy :delete_kindeditor_assets

1
app/models/journal.rb
View File

@ -55,7 +55,6 @@ class Journal < ActiveRecord::Base
# fq # fq
after_save :act_as_activity,:be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id) after_save :act_as_activity,:be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id)
after_create :issue_wechat_message
# end # end
#after_destroy :down_user_score #after_destroy :down_user_score
#before_save :be_user_score #before_save :be_user_score

6
public/javascripts/course.js
View File

@ -904,7 +904,11 @@ function regexDeadLine()
//新建、修改课程明码显示 //新建、修改课程明码显示
$(function(){ $(function(){
$("#psw_btn").click(function() { $("#psw_btn").click(function() {
alert("密码: "+$("#course_course_password").val()); if($("#new_course_course_password").length > 0) {
alert("密码: "+$("#new_course_course_password").val());
} else if($("#edit_course_course_password").length > 0){
alert("密码: "+$("#edit_course_course_password").val());
}
}); });
}); });

3
public/javascripts/wechat/app.js
View File

@ -111,9 +111,6 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
url: apiUrl+ "activities", url: apiUrl+ "activities",
data: {openid: auth.openid(), page: page} data: {openid: auth.openid(), page: page}
}).then(function successCallback(response) { }).then(function successCallback(response) {
if(response.data.message == "undefined method `user' for nil:NilClass"){
alert("请先绑定确实的用户账号");
}
$scope.current_page = 0; $scope.current_page = 0;
console.log($scope.current_page); console.log($scope.current_page);
console.log(response.data.page); console.log(response.data.page);