修改系统消息参数

输入内容JS控制
tmp
huang 10 years ago
parent b053a1e43c
commit dc564c37f1

@ -42,7 +42,7 @@ class SystemMessagesController < ApplicationController
@system_messages.user_id = User.current.id
respond_to do |format|
if @system_messages.save
format.html {redirect_to user_message_path(User.current, :type => "system_message")}
format.html {redirect_to user_message_path(User.current, :type => "system_messages")}
flash[:notice] = l(:notice_successful_message)
else
if params[:system_message][:content].empty?

@ -117,7 +117,7 @@ class UsersController < ApplicationController
message_last_time = message_new_time.onclick_time
message_new_time.update_attributes(:onclick_time => Time.now)
end
@user_system_messages = SystemMessage.where("created_at >?", message_last_time)
@user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
# 当前用户查看消息,则设置消息为已读
if params[:viewed] == "all"
course_querys = @user.course_messages
@ -148,7 +148,7 @@ class UsersController < ApplicationController
@message_alls << message_all.message
end
end
when 'system_message'
when 'system_messages'
@message_alls = SystemMessage.order("created_at desc").all
when 'apply'
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")

@ -60,7 +60,7 @@ module UsersHelper
'未读消息'
when 'apply'
'用户申请'
when 'system_message'
when 'system_messages'
'系统消息'
when 'homework'
'作业消息'

@ -25,7 +25,7 @@
<%# 系统贴吧 %>
<li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %></li>
<%# 系统消息 %>
<li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %></li>
<li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_messages'), :class => "resourcesGrey" %></li>
</ul>
</li>
</ul>
@ -42,7 +42,7 @@
</div>
<% end %>
<%# 系统消息 %>
<% if params[:type] != 'system_message' %>
<% if params[:type] != 'system_messages' %>
<% @user_system_messages.each do |usm| %>
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl">
@ -56,7 +56,7 @@
<span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息:</span>
</li>
<li class="homepageNewsContent fl">
<%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
<%= link_to usm.content.html_safe, user_message_path(User.current, :type => "system_messages"),
:class => "newsRed",
:onmouseover => "message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"
@ -350,7 +350,7 @@
</li>
<li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息:</span></li>
<li class="homepageNewsContent fl">
<%= link_to ma.content.html_safe, {:controller => 'system_messages', :action => 'index'},
<%= link_to ma.content.html_safe, user_message_path(User.current, :type => "system_messages"),
:class => "#{params[:type]=="unviewed" ? "newsBlack" : "newsRed"}",
:onmouseover =>"message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20150911031029) do
ActiveRecord::Schema.define(:version => 20150909062619) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false

Loading…
Cancel
Save