From 6b2b30274e4c26b45ca6da91a0303677962d736f Mon Sep 17 00:00:00 2001
From: Ben Halpern <bendhalpern@gmail.com>
Date: Thu, 26 Apr 2018 15:13:11 -0400
Subject: [PATCH] Add tag_line to org admin and add conditional on hiring post
 (#250)

---
 app/dashboards/organization_dashboard.rb |  2 ++
 app/views/articles/show.html.erb         | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/dashboards/organization_dashboard.rb b/app/dashboards/organization_dashboard.rb
index dc6a36e1c..53f50b775 100644
--- a/app/dashboards/organization_dashboard.rb
+++ b/app/dashboards/organization_dashboard.rb
@@ -12,6 +12,7 @@ class OrganizationDashboard < Administrate::BaseDashboard
     name: Field::String,
     slug: Field::String,
     summary: Field::Text,
+    tag_line: Field::String,
     profile_image: CarrierwaveField,
     nav_image: CarrierwaveField,
     url: Field::String,
@@ -56,6 +57,7 @@ class OrganizationDashboard < Administrate::BaseDashboard
     :name,
     :slug,
     :summary,
+    :tag_line,
     :profile_image,
     :nav_image,
     :url,
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 4d3cbb880..ff72e547c 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -131,12 +131,16 @@
         </h3>
         <% if @article.job_opportunity.present? %>
           <div class="tags" style="margin-bottom: 10px;">
-            <a class="tag" target="_blank" style="color:white;background:#0eb268;" href="https://www.google.com/maps/place/<%= JobOpportunity.last.location_given %>">
-              <%= @article.job_opportunity.location_city %>
-            </a>
-            <span class="tag" style="color:white;background:#0b82c6;">
-              <%= @article.job_opportunity.remoteness_in_words %>
-            </span>
+            <% if @article.job_opportunity.location_city.present? %>
+              <a class="tag" target="_blank" style="color:white;background:#0eb268;" href="https://www.google.com/maps/place/<%= JobOpportunity.last.location_given %>">
+                <%= @article.job_opportunity.location_city %>
+              </a>
+            <% end %>
+            <% if @article.job_opportunity.remoteness_in_words.present? %>
+              <span class="tag" style="color:white;background:#0b82c6;">
+                <%= @article.job_opportunity.remoteness_in_words %>
+              </span>
+            <% end %>
           </div>
         <% end %>
         <div class="tags">