Merge pull request #581 from coopdevs/post_id_report

Add post ID to offers/inquiries reports

Author: sseerrggii

app/decorators/post_report_decorator.rb

@@ -14,6 +14,7 @@ def name(extension)
 
   def headers
     [
+      "",
       @type.model_name.human,
       User.model_name.human
     ]
@@ -23,10 +24,11 @@ def rows
     grouped_rows = []
 
     @collection.each do |category, posts|
-      grouped_rows << [category.try(:name) || "-", ""]
+      grouped_rows << ["", category.try(:name) || "-", ""]
 
       posts.each do |post|
         grouped_rows << [
+          post.id,
           post.title,
           "#{post.user} (#{post.member_uid})"
         ]

app/views/application/_navbar.html.erb

@@ -52,11 +52,31 @@
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
           <ul class="nav nav-pills actions-menu">
-            <%= render 'application/menus/user_list_link' %>
-            <%= render 'application/menus/offers_list_link' %>
-            <%= render 'application/menus/inquiries_list_link' %>
+            <li class="<%= "active" if current_page?(users_path) %>">
+              <%= link_to users_path do %>
+                <%= glyph :user %>
+                <%= t("users.index.members") %>
+              <% end %>
+            </li>
+            <li class="<%= "active" if current_page?(offers_path) %>">
+              <%= link_to offers_path do %>
+                <%= glyph :offer %>
+                <%= Offer.model_name.human(count: :many) %>
+              <% end %>
+            </li>
+            <li class="<%= "active" if current_page?(inquiries_path) %>">
+              <%= link_to inquiries_path do %>
+                <%= glyph :inquiry %>
+                <%= Inquiry.model_name.human(count: :many) %>
+              <% end %>
+            </li>
             <% if current_user.manages? current_organization %>
-              <%= render 'application/menus/offers_by_tag_link' %>
+              <li class="<%= "active" if current_page?(alpha_grouped_index_tags_path(post_type: "offer")) %>">
+                <%= link_to alpha_grouped_index_tags_path(post_type: "offer") do %>
+                  <%= glyph :tags %>
+                  <%= t ".tags" %>
+                <% end %>
+              </li>
               <%= render 'application/menus/organization_reports_menu' %>
               <%= render 'application/menus/organization_statistics_menu' %>
               <%= render 'application/menus/organization_listings_menu' %>

app/views/application/menus/_inquiries_list_link.html.erb

@@ -1,5 +1,16 @@
 <% if current_user.organizations.count > 1 %>
-  <%= render 'application/menus/organization_switcher' %>
+  <li class="disabled">
+    <a href="#"><%= current_organization.name %></a>
+  </li>
+  <% (current_user.organizations - [current_organization]).each do |org| %>
+    <li>
+      <%= link_to set_current_organization_path(org), method: :post do %>
+        <%= glyph(:retweet) %>
+        <%= org.name %>
+      <% end %>
+    </li>
+  <% end %>
+
   <li class="divider" role="presentation"></li>
 <% end %>