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

Merge branch 'weixin_guange' into develop

This commit is contained in:
yuanke 2016-09-02 16:08:49 +08:00
parent 877d1930f0 ed7308969c
commit 6571b94bf1
15 changed files with 93 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/issues_controller.rb
View File

@ -196,8 +196,9 @@ class IssuesController < ApplicationController
priority_id = params[:issue][:priority_id]
ps = ProjectsService.new
ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
if senduser.id != User.current.id
ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
end
call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
respond_to do |format|
format.html {

8
public/assets/wechat/blog_detail.html
View File

@ -1,6 +1,14 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="blog.act_type == 'BlogComment'">
<div class="post-container">
<div class="post-wrapper" style="margin-top:0;">

8
public/assets/wechat/course_discussion.html
View File

@ -1,6 +1,14 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="discussion.act_type == 'Message'">
<div class="post-container">
<div loading-spinner></div>

8
public/assets/wechat/course_notice.html
View File

@ -1,6 +1,14 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="news.act_type == 'News'">
<div class="post-container">
<div class="post-wrapper" style="margin-top:0;">

8
public/assets/wechat/homework_detail.html
View File

@ -1,6 +1,14 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="homework.act_type == 'HomeworkCommon'">
<div class="post-container">
<div class="post-wrapper" style="margin-top:0;">

8
public/assets/wechat/issue_detail.html
View File

@ -1,6 +1,14 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="issue.act_type == 'Issue'">
<div class="post-container">
<div class="post-wrapper" style="margin-top:0;">

8
public/assets/wechat/jour_message_detail.html
View File

@ -1,5 +1,13 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="message.act_type == 'JournalsForMessage'">
<div class="post-container">
<div class="post-wrapper" style="margin-top:0;">

8
public/assets/wechat/project_discussion.html
View File

@ -1,6 +1,14 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<div loading-spinner></div>
<div ng-show="showtip">
<div class="blue-title">提示</div>
<div class="ac-wrap">
<ul class="ac-content f13 c-grey3">
<li class="mt30 mb15">啊哦，您来晚了，内容已经被删除了</li>
</ul>
</div>
</div>
<div ng-if="discussion.act_type == 'Message'">
<div class="post-container">
<div class="post-wrapper" style="margin-top:0;">

5
public/javascripts/wechat/controllers/blog.js
View File

@ -11,6 +11,11 @@ app.controller('BlogController',
loadCallback: function(data){
console.log(data.data);
if(data.status == -1){
$scope.showtip = true;
return;
}
//回复级别 0 一级回复 1 二级回复
replytype = data.type;
page = data.page;

5
public/javascripts/wechat/controllers/course_notice.js
View File

@ -10,6 +10,11 @@ app.controller('CourseNoticeController', ['$scope', '$http', '$routeParams', 'au
loadCallback: function(data){
console.log(data.data);
if(data.status == -1){
$scope.showtip = true;
return;
}
//回复级别 0 一级回复 1 二级回复
replytype = data.type;
page = data.page;

5
public/javascripts/wechat/controllers/discussion.js
View File

@ -9,6 +9,11 @@ app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth
loadCallback: function(data){
console.log(data.data);
if(data.status == -1){
$scope.showtip = true;
return;
}
//回复级别 0 一级回复 1 二级回复
replytype = data.type;
page = data.page;

5
public/javascripts/wechat/controllers/homework.js
View File

@ -9,6 +9,11 @@ app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth',
loadCallback: function(data){
console.log(data.data);
if(data.status == -1){
$scope.showtip = true;
return;
}
//回复级别 0 一级回复 1 二级回复
replytype = data.type;
page = data.page;

5
public/javascripts/wechat/controllers/issue.js
View File

@ -9,6 +9,11 @@ app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'c
loadCallback: function(data){
console.log(data.data);
if(data.status == -1){
$scope.showtip = true;
return;
}
//回复级别 0 一级回复 1 二级回复
replytype = data.type;
page = data.page;

5
public/javascripts/wechat/controllers/journals.js
View File

@ -8,6 +8,11 @@ app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth',
loadCallback: function(data){
console.log(data.data);
if(data.status == -1){
$scope.showtip = true;
return;
}
//回复级别 0 一级回复 1 二级回复
replytype = data.type;
page = data.page;

4
public/javascripts/wechat/others/factory.js
View File

@ -226,6 +226,10 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
var loadData = function(id,replytype,page){
loadCommonData(id, args.type,replytype,page).then(function successCallback(response) {
console.log(response.data);
if(response.data.status == -1){
args.loadCallback(response.data);
return;
}
//--------------分享内容定制-------------
var tmptile = "分享动态";
var imgUrl = "";