Merge pull request #604 from maebeale/inexhaustible-edit

Inexhaustible edit
rubyforgood · Jul 30, 2020 · ee9291e · ee9291e
2 parents 7f8d213 + 4c51d24
commit ee9291e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ## [Unreleased]
 ### Enhancements
 * Display inexhaustible icon on Contributions, Matches, Respond #601
+* Update Listings index layout to include buttons to get to Listing edit #604
+
+### Bugfixes
+* Fix bug where inexhaustible wasn't updating when edited on Triage page #604
 
 ## [0.2.6] - 2020-07-25
 ### Enhancements

diff --git a/app/controllers/contributions_controller.rb b/app/controllers/contributions_controller.rb
@@ -32,12 +32,14 @@ def triage_update
     contribution_params = params[@contribution.type.downcase.to_sym]
     title = contribution_params[:title]
     description = contribution_params[:description]
-    if @contribution.update(title: title, description: description)
-      CommunicationLog.create!(person: @contribution.person,
-                               sent_at: Time.current,
-                               subject: "triaged by #{current_user.name}",
-                               delivery_status: "connected",
-                               delivery_method: @contribution.person.preferred_contact_method)
+    inexhaustible = contribution_params[:inexhaustible]
+
+    if @contribution.update(title: title, description: description, inexhaustible: inexhaustible)
+      # CommunicationLog.create!(person: @contribution.person,
+      #                          sent_at: Time.current,
+      #                          subject: "triaged by #{current_user.name}",
+      #                          delivery_status: "connected",
+      #                          delivery_method: @contribution.person.preferred_contact_method)
       redirect_to respond_contribution_path(@contribution), notice: 'Contribution was successfully updated.'
     else
       render triage_contribution_path(@contribution)

diff --git a/app/views/admin/landing_page.html.erb b/app/views/admin/landing_page.html.erb
@@ -82,6 +82,7 @@
         ["donations"],
         ["feedbacks", "Feedback"],
         ["asks"],
+        ["listings"],
         ["offers"],
         ["matches"],
         ["people"],

diff --git a/app/views/listings/index.html.erb b/app/views/listings/index.html.erb
@@ -16,6 +16,7 @@
       <th>Urgency</th>
       <th>Match</th>
       <th>Action</th>
+      <th>Triage</th>
       <!-- <th>Find Match</th>-->
     </tr>
   </thead>
@@ -42,20 +43,18 @@
             <span class="tag <%= 'is-warning fa fa-exclamation' %>"></span>
           <% else %>
             <% if listing.matches.count > 1 %>
-              <%= link_to "Matches #{" (#{listing.matches.count})"}", matches_path(match_ids: listing.matches.map(&:id)), class: "button is-primary is-outlined" %>
+              <%= link_to "View Matches #{" (#{listing.matches.count})"}", matches_path(match_ids: listing.matches.map(&:id)), class: "button is-primary is-outlined" %>
             <% else %>
-              <%= link_to "Match", edit_match_path(listing.matches.last), class: "button is-primary is-outlined" %>
+              <%= link_to "View Match", edit_match_path(listing.matches.last), class: "button is-primary is-outlined" %>
             <% end %>
           <% end %>
         </td>
         <td>
-          <% if unmatched %>
-            <%= link_to("<span class='fa fa-reply'></span> <span> &nbsp Respond</span>".html_safe, respond_contribution_path(listing, contribution_type: listing.type),
-                        class: "button #{unmatched ? "is-primary" : "is-primary is-outlined"}") %>
-          <% else %>
-            <% button_css_class = "#{unmatched ? "is-primary is-outlined" : "is-primary"}" %>
-            <%= triage_button(listing, button_css_class) %>
-          <% end %>
+          <%= link_to("<span class='fa fa-reply'></span> <span> &nbsp Respond</span>".html_safe, respond_contribution_path(listing, contribution_type: listing.type),
+                      class: "button #{unmatched ? "is-primary" : "is-primary is-outlined"}") %>
+        </td>
+        <td>
+          <%= triage_button(listing, 'is-primary is-outlined') %>
         </td>
         <!-- # TODO - add find match functionality <td><%##= link_to("Find Match [TBD]", match_listing_path(listing), class: "button") %></td>-->
       </tr>