diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 1dacffb6f..fe3c3272a 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -660,8 +660,8 @@ class AttachmentsController < ApplicationController
end
def has_login
- unless @attachment && @attachment.container_type == "Organization"
- unless @attachment && @attachment.container_type == "PhoneAppVersion"
+ unless (@attachment && @attachment.container_type == "Organization").nil?
+ unless (@attachment && @attachment.container_type == "PhoneAppVersion").nil?
render_403 if !User.current.logged? && !(@attachment.container_type == 'OrgSubfield' && @attachment.container.organization.allow_guest_download) && !(@attachment.container_type == 'OrgDocumentComment' && @attachment.container.organization.allow_guest_download)
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 366cea06b..9572034aa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -120,59 +120,52 @@ module ApplicationHelper
case type
when "HomeworkCommon"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
- :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1)
else
- score = course_contributor_score.homework_journal_num + 1
+ score = course_contributor_score.homework_journal_num.to_i + 1
course_contributor_score.update_attributes(:homework_journal_num => score)
end
# 课程留言
when "Course"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
- :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1)
else
- score = course_contributor_score.journal_num + 1
+ score = course_contributor_score.journal_num.to_i + 1
course_contributor_score.update_attributes(:journal_num => score)
end
when "Message"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1, :message_reply_num => 0,
- :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1)
else
- score = course_contributor_score.message_num + 1
+ score = course_contributor_score.message_num.to_i + 1
course_contributor_score.update_attributes(:message_num => score)
end
when "MessageReply"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1,
- :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1)
else
- score = course_contributor_score.message_reply_num + 1
+ score = course_contributor_score.message_reply_num.to_i + 1
course_contributor_score.update_attributes(:message_reply_num => score)
end
when "NewReply"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
- :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1)
else
- score = course_contributor_score.news_reply_num + 1
+ score = course_contributor_score.news_reply_num.to_i + 1
course_contributor_score.update_attributes(:news_reply_num => score)
end
when "News"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
- :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1)
else
- score = course_contributor_score.news_num + 1
+ score = course_contributor_score.news_num.to_i + 1
course_contributor_score.update_attributes(:news_num => score)
end
when "Attachment"
if course_contributor_score.nil?
- CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
- :news_reply_num => 0, :news_num => 0, :resource_num => 1, :journal_num => 0, :journal_reply_num => 0)
+ CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1)
else
- score = course_contributor_score.resource_num + 1
+ score = course_contributor_score.resource_num.to_i + 1
course_contributor_score.update_attributes(:resource_num => score)
end
end
@@ -184,38 +177,38 @@ module ApplicationHelper
case type
when "HomeworkCommon"
unless course_contributor_score.nil?
- score = course_contributor_score.homework_journal_num - 1
+ score = course_contributor_score.homework_journal_num.to_i - 1
course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score)
end
# 课程留言
when "Course"
unless course_contributor_score.nil?
- score = course_contributor_score.journal_num - 1
+ score = course_contributor_score.journal_num.to_i - 1
course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score)
end
when "Message"
unless course_contributor_score.nil?
- score = course_contributor_score.message_num - 1
+ score = course_contributor_score.message_num.to_i - 1
course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score)
end
when "MessageReply"
unless course_contributor_score.nil?
- score = course_contributor_score.message_reply_num - 1
+ score = course_contributor_score.message_reply_num.to_i - 1
course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score)
end
when "NewReply"
unless course_contributor_score.nil?
- score = course_contributor_score.news_reply_num - 1
+ score = course_contributor_score.news_reply_num.to_i - 1
course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score)
end
when "News"
unless course_contributor_score.nil?
- score = course_contributor_score.news_num - 1
+ score = course_contributor_score.news_num.to_i - 1
course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score)
end
when "Attachment"
unless course_contributor_score.nil?
- score = course_contributor_score.resource_num - 1
+ score = course_contributor_score.resource_num.to_i - 1
course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score)
end
end
diff --git a/app/models/message.rb b/app/models/message.rb
index 2f4637042..1c7bf7677 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -80,12 +80,10 @@ class Message < ActiveRecord::Base
validates_length_of :subject, :maximum => 255
validate :cannot_reply_to_locked_topic, :on => :create
- after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
+ # after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
after_update :update_messages_board, :update_activity
after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
-
- after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity,
- :act_as_system_message, :send_mail, :act_as_student_score, act_as_at_message(:content, :author_id)
+ after_create :act_as_course_activity, :act_as_forge_activity, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count
#before_save :be_user_score
scope :visible, lambda {|*args|
@@ -137,11 +135,11 @@ class Message < ActiveRecord::Base
if self.project && !project.project_score.nil?
# 讨论区
if self.parent_id.nil?
- count = self.project.project_score.board_num + 1
- self.project.project_score.update_attribute(:board_num, count)
+ count = self.project.project_score.board_num.to_i + 1
+ self.project.project_score.update_column(:board_num, count)
else # 回复
- count = self.project.project_score.board_message_num + 1
- self.project.project_score.update_attribute(:board_message_num, count)
+ count = self.project.project_score.board_message_num.to_i + 1
+ self.project.project_score.update_column(:board_message_num, count)
end
end
end
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 722024a85..ad3ce7a3e 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -43,8 +43,8 @@
+ <% if User.current.logged? %>
-
- <% if User.current.logged? %>
<% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" %>
- <%= link_to("发 送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %>
@@ -66,8 +66,8 @@
- <%= link_to("发 送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %>
<% end %>
- <% end %>
+ <% end %>
diff --git a/db/schema.rb b/db/schema.rb
index 2fd7fd91d..f9eafe2d8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20160408074854) do
+ActiveRecord::Schema.define(:version => 20160414055511) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -809,6 +809,7 @@ ActiveRecord::Schema.define(:version => 20160408074854) do
t.integer "anonymous_comment", :default => 0
t.integer "quotes", :default => 0
t.integer "is_open", :default => 0
+ t.datetime "simi_time"
end
add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
@@ -1685,6 +1686,8 @@ ActiveRecord::Schema.define(:version => 20160408074854) do
t.integer "absence_penalty", :default => 0
t.float "system_score", :default => 0.0
t.boolean "is_test", :default => false
+ t.integer "simi_id"
+ t.integer "simi_value"
end
add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
diff --git a/lib/tasks/sync_files.rake b/lib/tasks/sync_files.rake
new file mode 100644
index 000000000..5c9326356
--- /dev/null
+++ b/lib/tasks/sync_files.rake
@@ -0,0 +1,38 @@
+require 'trustie/gitlab/sync'
+
+namespace :trustie do
+ namespace :files do
+ desc "sync course'file"
+ task :course => :environment do
+ # Course.all.each do |course|
+ # unless course.attachments.count.to_i == 0
+ # attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and container_type ='Course'").count
+ # project_score = ProjectScore.where("project_id=?", project.id).first
+ # if project_score.nil?
+ # ProjectScore.create(:project_id => project.id, :attach_num => 0)
+ # else
+ # project_score.attach_num = attachment_count
+ # project_score.save
+ # end
+ # end
+ # end
+ end
+
+ desc "sync project'file"
+ task :project => :environment do
+ Project.all.each do |project|
+ unless project.attachments.count.to_i == 0
+ attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{project.id} and container_type ='Project'").count
+ project_score = ProjectScore.where("project_id=?", project.id).first
+ if project_score.nil?
+ ProjectScore.create(:project_id => project.id, :attach_num => 0)
+ else
+ project_score.attach_num = attachment_count
+ project_score.save
+ end
+ end
+ end
+ end
+
+ end
+end
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index f5eded3ee..7494b7033 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -26,9 +26,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
@@ -51,9 +51,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
@@ -76,9 +76,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
@@ -119,9 +119,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
@@ -145,9 +145,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
@@ -183,9 +183,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
@@ -209,9 +209,9 @@
-
-
赞 ({{act.praise_count}})
-
已赞 ({{act.praise_count}})
+
+
赞 ({{act.praise_count}})
+
已赞 ({{act.praise_count}})
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index b3b97f047..c1133f955 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -14,9 +14,9 @@
-
回复 ({{blog.comment_count}})
-
已赞 ({{blog.praise_count}})
-
赞 ({{blog.praise_count}})
+
回复 ({{blog.comment_count}})
+
已赞 ({{blog.praise_count}})
+
赞 ({{blog.praise_count}})
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 9c70dfcfc..3f095ab62 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -20,9 +20,9 @@
-
回复 ({{discussion.replies_count}})
-
已赞 ({{discussion.praise_count}})
-
赞 ({{discussion.praise_count}})
+
回复 ({{discussion.replies_count}})
+
已赞 ({{discussion.praise_count}})
+
赞 ({{discussion.praise_count}})
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 750543e03..3b7965733 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -20,9 +20,9 @@
-
回复 ({{news.comments_count}})
-
已赞 ({{news.praise_count}})
-
赞 ({{news.praise_count}})
+
回复 ({{news.comments_count}})
+
已赞 ({{news.praise_count}})
+
赞 ({{news.praise_count}})
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 776ecb4ce..fec0c4cff 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -26,9 +26,9 @@
-
回复 ({{homework.whomework_journal_count}})
-
已赞 ({{homework.praise_count}})
-
赞 ({{homework.praise_count}})
+
回复 ({{homework.whomework_journal_count}})
+
已赞 ({{homework.praise_count}})
+
赞 ({{homework.praise_count}})
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 38f732e6f..f61d803dd 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -24,9 +24,9 @@
-
回复 ({{issue.journals_count}})
-
已赞 ({{issue.praise_count}})
-
赞 ({{issue.praise_count}})
+
回复 ({{issue.journals_count}})
+
已赞 ({{issue.praise_count}})
+
赞 ({{issue.praise_count}})
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 7ce14e4a8..0bc87214b 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -11,9 +11,9 @@
-
回复 ({{message.reply_count}})
-
已赞 ({{message.praise_count}})
-
赞 ({{message.praise_count}})
+
回复 ({{message.reply_count}})
+
已赞 ({{message.praise_count}})
+
赞 ({{message.praise_count}})
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 185d06784..890b47a73 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -20,9 +20,9 @@
-
回复 ({{discussion.replies_count}})
-
已赞 ({{discussion.praise_count}})
-
赞 ({{discussion.praise_count}})
+
回复 ({{discussion.replies_count}})
+
已赞 ({{discussion.praise_count}})
+
赞 ({{discussion.praise_count}})
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index bedd79ed4..35d2a1b3d 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -3,7 +3,7 @@ var apiUrl = '/api/v1/';
var debug = false; //调试标志,如果在本地请置为true
if(debug===true){
- apiUrl = 'https://www.trustie.net/api/v1/';
+ apiUrl = 'http://localhost:3000/api/v1/';
}
app.factory('auth', function($http,$routeParams, $cookies, $q){
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 3872bb649..f164b80e3 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -23,6 +23,7 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
.c-grey3 {color:#555555;}
a {color:#707070;}
a.c-grey {color:#707070;}
+a.c-grey2 {color:#9a9a9a;}
a:link,a:visited{text-decoration:none;}
a:hover,a:active{cursor:pointer;}
a.link-blue {color:#269ac9;}
@@ -38,7 +39,7 @@ a.underline {text-decoration:underline;}
/*动态样式*/
.post-container {width:100%;}
-.post-wrapper {width:98%; border:1px solid #e6e6e6; border-radius:3px; background-color:#ffffff; margin:15px auto;}
+.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:15px auto;}
.post-main {padding:10px; color:#9a9a9a;}
.post-avatar {width:45px; height:45px; margin-right:10px;}
.post-title {font-size:13px; text-align:left;}
@@ -48,20 +49,18 @@ a.underline {text-decoration:underline;}
.cl {clear:both; overflow:hidden;}
.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
.post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
-.post-interactive-column {width:50%; text-align:center; float:left; font-size:13px;}
-.post-interactive-reply {width:50%; text-align:center; float:left; font-size:13px;}
+.post-interactive-column,
+.post-interactive-reply,
.post-interactive-praise {width:50%; text-align:center; float:left; font-size:13px;}
.more-wrap {width:100%;}
.more-events {width:98%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; }
.border-bottom {border-bottom:1px solid #e6e6e6;}
-.post-reply-wrap {width:100%; line-height:18px; background-color:#f8f9fb;}
-.post-input-wrap {width:100%; line-height:18px; background-color:#f8f9fb;}
+.post-reply-wrap, .post-input-wrap {width:100%; line-height:18px; background-color:#f8f9fb;}
.post-reply-row {padding:10px; color:#9a9a9a;}
.post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
.post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
.post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden;}
-.post-reply-date {font-size:13px;}
-.post-reply-trigger {font-size:13px;}
+.post-reply-date, .post-reply-trigger {font-size:13px;}
.post-input-container {padding-right:2px;}
.post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;}
.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
\ No newline at end of file