增加组织模块中项目讨论区的回复功能

app/controllers/messages_controller.rb

@@ -174,6 +174,11 @@ class MessagesController < ApplicationController
       user_activity.updated_at = Time.now
       user_activity.save
     end
+    org_activity = OrgActivity.where("org_act_type='Message' and org_act_id =#{@topic.id}").first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/organizations_controller.rb

@@ -56,10 +56,10 @@ class OrganizationsController < ApplicationController
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
       project_ids = @organization.projects.map(&:id) << 0
-      @org_activities  = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))",
+      @org_activities  = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')}))",
                                        @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
-      @org_activities_count  = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" ,
-                                           @organization.id, 'Organization ').count
+      # @org_activities_count  = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" ,
+      #                                      @organization.id, 'Organization ').count
       # @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page]  || 1).per(10)
       # @org_project_activties_count =  ForgeActivity.where('project_id in (?)',project_ids.join(',')).count
       #@org_activities = paginateHelper @org_activities, 10

app/views/organizations/_org_activities.html.erb

@@ -31,8 +31,8 @@
                 <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message' %>
                 <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <%# when 'ProjectCreateInfo'%>
-                <%#= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
+            <% when 'ProjectCreateInfo'%>
+                <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>
         <% end %>
     <% end %>

app/views/organizations/_project_create.html.erb

@@ -1,4 +1,4 @@
-<% project = Project.find(activity.project_id) %>
+<% project = Project.find(activity.org_act_id) %>
 <% user = User.find(project.user_id)%>
 <div class="resources mt10">
   <div class="homepagePostBrief">

app/views/organizations/_project_message.html.erb

@@ -95,6 +95,24 @@
         </div>
     <% end %>
 
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="quote[quote]" value="">
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
 
   </div>
 </div>

app/views/organizations/show.html.erb

@@ -14,14 +14,17 @@
 </style>
 <div class="homepageRightBanner">
   <div class="NewsBannerName">最新动态</div>
-<!--  <ul class="resourcesSelect">
+  <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
       <ul class="resourcesType">
         <li class="mt-4"><a href="javascript:void(0);" class="homepagePostTypeAll postTypeGrey">全部动态</a></li>
-        <li class="mt-4"><a href="/users/8523/user_activities?type=current_user" class="homepagePostTypeMine postTypeGrey">我的动态</a> </li>
+        <li class="mt-4">
+          <a href="/users/8523/user_activities?type=current_user" class="homepagePostTypeMine postTypeGrey">我的动态</a>
+        </li>
       </ul>
     </li>
-  </ul>-->
+  </ul>
+
 </div>
 
 <% if !@organization.home_id.nil?  and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>