diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb index e3dbb5023..a46e10da5 100644 --- a/app/api/mobile/entities/issue.rb +++ b/app/api/mobile/entities/issue.rb @@ -52,6 +52,10 @@ module Mobile time_from_now issue.created_on when :act_id issue.id + when :act_type + 'Journal' + when :praise_count + get_activity_praise_num(issue) end end end diff --git a/app/api/mobile/entities/news.rb b/app/api/mobile/entities/news.rb index a64081d8a..d8c4dcab3 100644 --- a/app/api/mobile/entities/news.rb +++ b/app/api/mobile/entities/news.rb @@ -36,6 +36,10 @@ module Mobile time_from_now f.created_on when :act_id f.id + when :praise_count + get_activity_praise_num(f) + when :act_type + 'Comment' end elsif f.is_a?(Hash) && !f.key?(field) diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index 3b082e7b4..54dda1568 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -61,9 +61,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 8e0c11c1f..0daf0e1bb 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -59,9 +59,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 5c933aee2..a24321b5e 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -74,9 +74,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index ba3dd6553..9ffdcea4a 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -63,9 +63,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index ed5e0cf09..8aefc8d17 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -80,9 +80,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index 922b6dbfb..8062ccccc 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -58,9 +58,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index f1e492d8b..e29b062dc 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -59,9 +59,9 @@
-
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}