组织动态添加项目动态

app/controllers/organizations_controller.rb

@@ -1,5 +1,33 @@
 # encoding: utf-8
 class OrganizationsController < ApplicationController
+
+
+  helper :sort
+  include SortHelper
+  helper :custom_fields
+  include CustomFieldsHelper
+  include AvatarHelper
+  include WordsHelper
+  include GitlabHelper
+  include UserScoreHelper
+
+  include PollHelper
+  helper :user_score
+  helper :journals
+
+  # added by liuping 关注
+
+  helper :watchers
+  helper :activities
+
+  ### added by william
+  include ActsAsTaggableOn::TagsHelper
+
+  #  fq
+  helper :words
+  helper :project_score
+  helper :issues
+  include UsersHelper
   before_filter :find_organization, :only => [:show, :members]
   layout 'base_org'
   def index
@@ -27,13 +55,22 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
-      @activities  = OrgActivity.where('container_id =? and container_type =? ',
+      @org_activities  = OrgActivity.where('container_id =? and container_type =? ',
-                                       @organization.id, 'Organization ').order('updated_at desc')
+                                       @organization.id, 'Organization ').order('updated_at desc').page(params[:page]).per(10)
-
+      @org_activities_count  = OrgActivity.where('container_id =? and container_type =? ',
-      @activities = paginateHelper @activities, 10
+                                           @organization.id, 'Organization ').order('updated_at desc').count
+      project_ids = @organization.projects.map(&:id)
+      @org_project_activties = ForgeActivity.where('project_id in (?)',project_ids.join(',')).page(params[:page]).per(10)
+      @org_project_activties_count =  ForgeActivity.where('project_id in (?)',project_ids.join(',')).count
+      #@org_activities = paginateHelper @org_activities, 10
+      @page = params[:page]
     else
       render_403
     end
+    respond_to do |format|
+      format.html
+      format.js
+    end
   end
 
   def update

app/helpers/organizations_helper.rb

@@ -17,4 +17,6 @@ module OrganizationsHelper
       s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end
 
+
+
 end

app/views/organizations/_org_project_activities.html.erb

@@ -0,0 +1,30 @@
+<% org_project_activties.each do |act|%>
+<% if act %>
+
+        <% unless act.forge_act_type == "ProjectCreateInfo" %>
+                <% if act  %>
+                    <% case act.forge_act_type.to_s %>
+                    <% when 'Issue' %>
+                        <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
+                    <% when 'Message' %>
+                        <%= render :partial => 'users/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
+                    <% when 'ProjectCreateInfo'%>
+                        <%= render :partial => 'users/project_create', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
+                    <% end %>
+                <% end %><% end %>
+<% end %>
+<% end %>
+<% if org_act_count == 10 ||  pro_act_count == 10 %>
+    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
+    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% end%>
+
+<script>
+    $(function(){
+        $("#show_more_activities").mouseover(function(){
+            $("#more_org_activities_link").click();
+        })
+    })
+
+</script>
+

app/views/organizations/_org_project_issue.html.erb

@@ -0,0 +1,136 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>  TO
+        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
+      </div>
+      <div class="homepagePostTitle break_word">
+        <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
+        <span class='<%#= get_issue_priority(activity.priority_id)[0] %>'>
+          <%#= get_issue_priority(activity.priority_id)[1] %>
+        </span>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
+          <% unless activity.assigned_to_id.nil? %>
+              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% else %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% end %>
+          <% end %>
+        </div>
+        <div class="homepagePostDeadline">
+          时间：
+          <%=format_time(activity.created_on) %>
+        </div>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <% if activity.description? %>
+              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
+          <% end %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <% if activity.attachments.any? %>
+            <% activity.attachments.each do |attachment| %>
+                <div class="break_word">
+                  <span class="fl">
+                  <span title="<%= attachment.filename %>" id="attachment_">
+                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%>
+                  </span>
+                    <% if attachment.is_text? %>
+                      <%= link_to image_tag('magnifier.png'),
+                                  :controller => 'attachments',
+                                  :action => 'show',
+                                  :id => attachment,
+                                  :class => 'fl',
+                                  :filename => attachment.filename %>
+                  <% end %>
+                  </span>
+                  <span class="postAttSize">(
+                    <%= number_to_human_size attachment.filesize %>)
+                  </span>
+                  <span class="author" title="<%= attachment.author%>">
+                    <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+                    <%= format_time(attachment.created_on) %>
+                  </span>
+                </div>
+            <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count = activity.journals.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复（<%= count %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <% if count > 3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.journals.reorder("created_on desc").each do |reply| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= reply.id %>');
+                    });
+                </script>
+                <% replies_all_i=replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if reply.try(:user).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(reply.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                      <% if reply.details.any? %>
+                          <% details_to_strings(reply.details).each do |string| %>
+                          <p><%= string %></p>
+                          <% end %>
+                      <% end %>
+                      <P><%= reply.notes %></P>
+                    </div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+
+
+  </div>
+</div>

app/views/organizations/show.html.erb

@@ -34,8 +34,8 @@
         <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %>
 <% end  %>
 
-  <% unless @activities.nil? %>
+  <% unless @org_activities.nil? %>
-      <% @activities.each do |act| %>
+      <% @org_activities.each do |act| %>
           <% if act.org_act_type == 'CreateOrganization' %>
               <div class="resources mt10">
                 <div class="homepagePostBrief">
@@ -60,10 +60,20 @@
                 <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %>
           <% end %>
       <% end %>
-    <ul class="wlist" style=" border:none; padding-top: 15px;">
+    <!--<ul class="wlist" style=" border:none; padding-top: 15px;">-->
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+      <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    </ul>
+    <!--</ul>-->
   <% end %>
 
+  <%# @org_project_activties.each do |org_act|%>
+    <%= render :partial =>  'organizations/org_project_activities',
+               :locals => {:org_project_activties =>@org_project_activties,
+                           :page=>@page,
+                           :org => @organization,
+                           :org_act_count=>@org_activities.count,
+                           :pro_act_count=>@org_project_activties.count}%>
+  <%# end %>
+
+
 
 

app/views/organizations/show.js.erb

@@ -0,0 +1,7 @@
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'organizations/org_project_activities',
+               :locals => {:org_project_activties =>@org_project_activties,
+                           :page=>@page,
+                           :org => @organization,
+                           :org_act_count=>@org_activities.count,
+                           :pro_act_count=>@org_project_activties.count} )%>");
+