Fixed not rendering org avatar: improvements

app/helpers/login_helper.rb

@@ -23,13 +23,8 @@ module LoginHelper
     !organization.nil? ? darken_color(organization.color, 0.7) : "#292E33"
   end
 
-  def login_org_avatar
-    if @organization && @organization.name != "team" && !@organization.avatar_url.blank?
-      @organization.avatar_url = @organization.avatar_url.sub(/^https?\:/, '')
-      return true
-    else
-      return false
-    end
+  def present_organization_avatar?
+    @organization.avatar_url.present?
   end
 
   def forget_password_url

app/views/admin/shared/_sessions_header.html.erb

@@ -4,15 +4,19 @@
       <div class="Navbar-header">
         <div class="Navbar-title">
           <picture class="Navbar-brand">
-            <% if login_org_avatar %>
-              <img src="<%= @organization.avatar_url %>" alt="<%= @organization.name %>" height="48" />
+            <% if @organization && @organization.name != "team" %>
+              <% if present_organization_avatar? %>
+                <img src="<%= @organization.avatar_url.sub(/^https?\:/, '') %>" alt="<%= @organization.name %>" height="48" />
+              <% end %>
             <% else %>
               <source type="image/svg+xml" srcset="<%= image_path "layout/sessions/brand.svg" %>">
               <img src="<%= image_path "layout/sessions/brand.png" %>" alt="CartoDB" height="48" width="48" />
             <% end %>
           </picture>
-          <% if login_org_avatar %>
-            <sup><img src="<%= image_path "layout/sessions/brand.png" %>" alt="CartoDB" height="26" width="26"></sup>
+          <% if @organization && @organization.name != "team" %>
+            <% if present_organization_avatar? %>
+              <sup><img src="<%= image_path "layout/sessions/brand.png" %>" alt="CartoDB" height="26" width="26"></sup>
+            <% end %>
           <% end %>
         </div>
         <% if !Cartodb.config[:cartodb_com_hosted].present? && @organization.present? %>