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-11-25 10:34:06 +08:00
parent 58790bcb72 1736ada972
commit 2f07aefd36
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/users_controller.rb
View File

@ -1369,9 +1369,10 @@ class UsersController < ApplicationController
@jour = jours.limit(10).offset(@page * 10)
@type = params[:type]
if User.current == @user
jours.update_all(:is_readed => true, :status => false)
jours.each do |journal|
fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
@jour.update_all(:is_readed => true, :status => false)
@jour.each do |journal|
# fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
journal.delay.set_children_readed_delay
end
end
@state = false

5
app/models/journals_for_message.rb
View File

@ -344,4 +344,9 @@ class JournalsForMessage < ActiveRecord::Base
def content_detail
self.notes
end
def set_children_readed_delay
# fetch_user_leaveWord_reply(self).update_all(:is_readed => true, :status => false)
end
end

4
app/views/projects/show.html.erb
View File

@ -3,9 +3,9 @@
<div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
<div id="project_description_code" style="padding: 0 15px 10px 15px;">
<% if @project.description.blank? %>
<p class="break_word" style="padding-top:5px"><%= @project.name %></p>
<p style="padding-top:5px"><%= @project.name %></p>
<% else %>
<p class="break_word" style="padding-top:5px"><%=h @project.description.html_safe %></p>
<p style="padding-top:5px"><%=h @project.description.html_safe %></p>
<% end %>
</div>
</div>