refactor code

Author: gmartincor

app/controllers/posts_controller.rb

@@ -6,6 +6,16 @@ class PostsController <  ApplicationController
   def index
     context = model.active.of_active_members
 
+    if current_user.present? && current_organization.present?
+      if params[:show_allied].present?
+      allied_org_ids = current_organization.allied_organizations.pluck(:id)
+      org_ids = [current_organization.id] + allied_org_ids
+      context = context.by_organizations(org_ids)
+      elsif !params[:org].present?
+      context = context.by_organization(current_organization.id)
+      end
+    end
+
     posts = apply_scopes(context)
     posts = posts.search_by_query(params[:q]) if params[:q].present?
     posts = posts.page(params[:page]).per(25)
@@ -92,15 +102,6 @@ def post_params
     end
   end
 
-  # TODO: remove this horrible hack ASAP
-  #
-  # This hack set the current organization to the post's
-  # organization, both in session and controller instance variable.
-  #
-  # Before changing the current organization it's important to check that
-  # the current_user is an active member of the organization.
-  #
-  # @param organization [Organization]
   def update_current_organization!(organization)
     return unless current_user && current_user.active?(organization)
 

app/models/organization.rb

@@ -84,6 +84,12 @@ def rejected_alliances
     source_alliances.rejected.or(target_alliances.rejected)
   end
 
+  def allied_organizations
+    source_org_ids = source_alliances.accepted.pluck(:target_organization_id)
+    target_org_ids = target_alliances.accepted.pluck(:source_organization_id)
+    Organization.where(id: source_org_ids + target_org_ids)
+  end
+
   def ensure_reg_number_seq!
     update_column(:reg_number_seq, members.maximum(:member_uid))
   end

app/views/shared/_post_filters.html.erb

@@ -51,7 +51,13 @@
         </a>
         <ul class="dropdown-menu" role="menu">
           <li>
-            <%= link_to "× #{t('global.all')}", base_path + (params[:cat] ? "?cat=#{params[:cat]}" : ""), class: "dropdown-item" %>
+            <% 
+              query_params = {}
+              query_params[:show_allied] = true
+              query_params[:cat] = params[:cat] if params[:cat].present?
+              link_path = "#{base_path}?#{query_params.to_query}"
+            %>
+            <%= link_to "× #{t('global.all')}", link_path, class: "dropdown-item" %>
           </li>
           <% allied_organizations.each do |org| %>
             <% next if org.id.to_s == params[:org] %>