添加系统消息单独新页面

app/controllers/system_messages_controller.rb

@@ -14,7 +14,8 @@ class SystemMessagesController < ApplicationController
   # end
 
   def index
-    @system_messages = SystemMessage.all
+    render_403
+    # @system_messages = SystemMessage.all
   end
 
   # def show
@@ -38,14 +39,14 @@ class SystemMessagesController < ApplicationController
       return
     end
     @system_messages = SystemMessage.new
-    @system_messages.description = params[:system_message][:description]
+    @system_messages.description = params[:system_messages][:description]
     @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_messages")}
         flash[:notice] = l(:notice_successful_message)
       else
-        if params[:system_message][:description].empty?
+        if params[:system_messages][:description].empty?
           flash[:error] = l(:label_content_blank_fail)
         else
           flash[:error] = l(:label_admin_message_fail)

app/controllers/users_controller.rb

@@ -46,7 +46,7 @@ class UsersController < ApplicationController
                                       :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :system_messages]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -200,6 +200,15 @@ class UsersController < ApplicationController
     end
   end
 
+  # 系统消息
+  def system_messages
+    @sytem_messages = SystemMessage.order("created_at desc").all
+    @sytem_messages = paginateHelper @sytem_messages,25
+    respond_to do |format|
+      format.html{render :layout=>'new_base_user'}
+    end
+  end
+
   def user_projects_index
     if User.current.admin?
       memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first

app/views/admin/messages.html.erb

@@ -3,7 +3,7 @@
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message-form'}) do |f| %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_messages-form'}) do |f| %>
       <div class="field">
         <%= f.kindeditor :description,:width=>'87%',:editor_id=>'system_message_editor' %>
         <p id="content_notice_span" class="ml55"></p>
@@ -40,7 +40,7 @@
     function submit_message() {
 
         if (system_message_length()) {
-            $("#system_message-form").submit();
+            $("#system_messages-form").submit();
         }
     }
 </script>

app/views/users/system_messages.html.erb

@@ -0,0 +1,65 @@
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">系统消息</div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="newsType">
+        <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
+        <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
+        <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+        <%# 课程相关消息 %>
+        <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
+        <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+        <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
+        <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
+        <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
+        <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
+        <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
+        <%# 项目相关消息 %>
+        <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+        <!--<li><%#= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>-->
+        <!--<li><%#= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>-->
+        <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
+        <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
+        <%# 项目相关消息 %>
+        <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
+        <%# 系统贴吧 %>
+        <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+        <%# 系统消息 %>
+        <li><%= link_to "系统消息", system_messages_path(User.current), :class => "resourcesGrey" %></li>
+      </ul>
+    </li>
+  </ul>
+</div>
+
+<% @sytem_messages.each do |sytem_message| %>
+    <div class="resources mt10">
+      <div class="homepagePostBrief">
+        <div class="homepagePostPortrait">
+          <%= link_to image_tag(url_to_avatar(sytem_message.user), :width => "50", :height => "50"), user_path(sytem_message.user_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostDes">
+          <div class="homepagePostTo break_word">
+           Trustie平台 发布了 <!--+"(课程名称)" -->
+            系统消息
+          </div>
+          <div class="homepagePostTitle break_word"> <!--+"(作业名称)"-->
+            系统消息系统消息系统消息系统消息
+          </div>
+          <div class="homepagePostSubmitContainer">
+            <div class="homepagePostSubmit">
+              <%#= student_work_activity_submit_status(homework: activity) %>
+            </div>
+            <div class="homepagePostDeadline">截止时间：<%= sytem_message.created_at %></div>
+          </div>
+          <div class="homepagePostIntro break_word upload_img">
+            <%= sytem_message.content.nil? ? sytem_message.description.html_safe : sytem_message.content.html_safe %>
+          </div>
+
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+<% end %>
+<ul class="wlist" style=" border:none; padding-top: 15px;">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>

config/routes.rb

@@ -389,6 +389,7 @@ RedmineApp::Application.routes.draw do
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
   #消息
   match 'users/:id/user_messages', :to => 'users#user_messages', :via => :get, :as => "user_message"
+  match 'users/:id/system_messages', :to => 'users#system_messages', :via => :get, :as => "system_messages"
   #match 'users/:id/user_messages/:homework', :to => 'users#user_messages_homework', :via => :get, :as => "user_message_homewrok"
 
 

spec/factories/system_messages.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :system_message do
+  factory :system_messages do
     id 1
 user_id 1
 content "MyString"