Fix blank url display

EstebanAO · May 7, 2019 · 315e3a7 · 315e3a7
1 parent 700361c
commit 315e3a7
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 7 deletions.
diff --git a/app/models/professor.rb b/app/models/professor.rb
@@ -7,6 +7,9 @@ class Professor < ApplicationRecord
   before_save :validate_https
 
   def validate_https
+    if self.resume == "" || self.resume == nil then
+      return 
+    end
     url_cpy_with_s = self.resume
     url_cpy_with_out_s = self.resume
     url_cpy_with_s = url_cpy_with_s[0...8]

diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
@@ -16,7 +16,11 @@
       <% @documents.each do |document| %>
         <tr>
           <td class="text-center"><%= document.description %></td>
-          <td class="text-center"><%= link_to nil, "http://#{document.url}"%></td>
+          <% unless document.url.blank?%>
+            <td class="text-center table-hidde"><%= link_to nil, "http://#{document.url}"%></td>
+          <% else %>
+            <td class="text-center table-hidde"></td>
+          <% end %>
           <td class="text-center">
             <%= link_to document do %>
               <i class="btn fas fa-eye fa-sm text-primary" aria-hidden="true"></i>

diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
@@ -9,7 +9,9 @@
 
   <p class="text-center">
     <strong>URL:</strong>
-    <%= link_to nil, "http://#{@document.url}"%>
+    <% unless @document.url.blank? %>
+      <%= link_to nil, "http://#{@document.url}"%>
+    <% end %>
   </p>
 
    <p class="text-center">

diff --git a/app/views/links/index.html.erb b/app/views/links/index.html.erb
@@ -26,7 +26,11 @@
           <td class="text-center table-hidde"><%= link.start_date %></td>
           <td class="text-center table-hidde"><%= link.end_date %></td>
           <td class="text-center table-hidde"><%= link.link_type %></td>
-          <td class="text-center table-hidde"><%= link_to nil, "http://#{link.url}"%></td>
+          <% unless link.url.blank?%>
+            <td class="text-center table-hidde"><%= link_to nil, "http://#{link.url}"%></td>
+          <% else %>
+            <td class="text-center table-hidde"></td>
+          <% end %>
           <td class="text-center">
             <%= link_to link do %>
               <i class="btn fas fa-eye fa-sm text-primary" aria-hidden="true"></i>

diff --git a/app/views/links/show.html.erb b/app/views/links/show.html.erb
@@ -34,7 +34,9 @@
 
   <p class="text-center">
     <strong>URL:</strong>
-    <%= link_to nil, "http://#{@link.url}"%>
+    <% unless @link.url.blank? %>
+      <%= link_to nil, "http://#{@link.url}"%>
+    <% end %>
   </p>
 
   <p class="text-center">

diff --git a/app/views/professors/index.html.erb b/app/views/professors/index.html.erb
@@ -18,7 +18,11 @@
           <td class="text-center"><%= professor.name %> <%= professor.father_last_name %> <%= professor.mother_last_name %></td>
           <td class="text-center table-hidde"><%= professor.email %></td>
           <td class="text-center table-hidde"><%= professor.office %></td>
-          <td class="text-center table-hidde"><%= link_to nil, "http://#{professor.resume}"%></td>
+          <% unless professor.resume.blank?%>
+            <td class="text-center table-hidde"><%= link_to nil, "http://#{professor.resume}"%></td>
+          <% else %>
+          <td class="text-center table-hidde"></td>
+          <% end %>
 
           <td class="text-center table-hidde"><%= professor.professor_type %></td>
           <td class="text-center">

diff --git a/app/views/professors/show.html.erb b/app/views/professors/show.html.erb
@@ -29,7 +29,9 @@
 
   <p class="text-center">
     <strong>CV:</strong>
-    <%= link_to nil, "http://#{@professor.resume}"%>
+    <% unless @professor.resume.blank?%>
+      <%= link_to nil, "http://#{@professor.resume}"%>
+    <% end %>
   </p>
 
   <p class="text-center">

diff --git a/app/views/professors/show_card.html.erb b/app/views/professors/show_card.html.erb
@@ -29,7 +29,9 @@
 
   <p class="text-center">
     <strong>CV:</strong>
-    <%= @professor.resume %>
+    <% if @professor.resume != ""%>
+      <%= link_to nil, "http://#{@professor.resume}"%>
+    <% end %>
   </p>
 
   <p class="text-center">