Merge pull request #1428 from KPB-US/fix-hidden-feed

dry up view, list groups feeds regardless of content
concerto · May 27, 2017 · acd9084 · acd9084
2 parents 8343933 + bdb04fb
commit acd9084
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 41 deletions.
diff --git a/app/views/groups/_feeds.html.erb b/app/views/groups/_feeds.html.erb
@@ -0,0 +1,18 @@
+<div class="span6">
+  <% unless feeds.empty? %>
+      <ul class="list-stacked">
+        <% feeds.each do |feed| %>
+            <% if feed %>
+                <li>
+                  <h3>
+                    <%= link_to feed_submissions_path(feed), class: "link-hl" do %>
+                        <span class="badge"><%= feed.approved_contents.active.count %></span> <%= feed.name %>
+                    <% end %>
+                    <small>&nbsp;&nbsp;<%= feed.description %></small>
+                  </h3>
+                </li>
+            <% end %>
+        <% end %>
+      </ul>
+  <% end %>
+</div>
diff --git a/app/views/groups/_show_body.html.erb b/app/views/groups/_show_body.html.erb
@@ -49,46 +49,8 @@
   </div>
 </div>
 <div class="row-fluid">
-  <div class="span6">
-    <% unless @feeds_left.empty? %>
-        <% viewable = 0 %>
-        <ul class="list-stacked">
-          <% @feeds_left.each do |feed| %>
-              <% if feed && (feed.approved_contents.size != 0 || feed.group.has_member?(current_user)) %>
-                  <% viewable+=1 %>
-                  <li>
-                    <h3>
-                      <%= link_to feed_submissions_path(feed), class: "link-hl" do %>
-                          <span class="badge"><%= feed.approved_contents.active.count %></span> <%= feed.name %>
-                      <% end %>
-                      <small>&nbsp;&nbsp;<%= feed.description %></small>
-                    </h3>
-                  </li>
-              <% end %>
-          <% end %>
-        </ul>
-    <% end %>
-  </div>
-  <div class="span6">
-    <% unless @feeds_right.empty? %>
-        <% viewable = 0 %>
-        <ul class="list-stacked">
-          <% @feeds_right.each do |feed| %>
-              <% if feed && (feed.approved_contents.size != 0 || feed.group.has_member?(current_user)) %>
-                  <% viewable+=1 %>
-                  <li>
-                    <h3>
-                      <%= link_to feed_submissions_path(feed), class: "link-hl" do %>
-                          <span class="badge"><%= feed.approved_contents.active.count %></span> <%= feed.name %>
-                      <% end %>
-                      <small>&nbsp;&nbsp;<%= feed.description %></small>
-                    </h3>
-                  </li>
-              <% end %>
-          <% end %>
-        </ul>
-    <% end %>
-  </div>
+  <%= render partial: 'feeds', locals: { feeds: @feeds_left } %>
+  <%= render partial: 'feeds', locals: { feeds: @feeds_right } %>
 </div>
 
 <!-- Begin Screens -->
@@ -140,4 +102,4 @@
         </li>
     <% end unless @group.memberships.regular.nil? %>
   </ul>
-</div>
+</div>