From 70eb506c570bff69453bb30101fb9e7faeec6cd8 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 28 Jun 2019 10:26:25 +0800
Subject: [PATCH] fix library user image

---
 app/views/libraries/_library_list.html.erb | 8 ++++++--
 app/views/libraries/show.html.erb          | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/libraries/_library_list.html.erb b/app/views/libraries/_library_list.html.erb
index e147e237..63314d65 100644
--- a/app/views/libraries/_library_list.html.erb
+++ b/app/views/libraries/_library_list.html.erb
@@ -2,13 +2,17 @@
   <% if @libraries.present? %>
     <% @libraries.each do |library| %>
       <li class="library_list_item">
-        <img src="/<%= url_to_avatar(library.user) %>" width="50" height="50" class="radius mr15 mt3">
+        <%= link_to image_tag(url_to_avatar(library.user), width: 50, height: 50, class: 'radius mr15 mt3'), user_path(library.user) %>
         <div class="flex1">
           <p class="task-hide font-16 mb15 lineh-20"><%= link_to library.title, library_path(library) %></p>
           <p class="clearfix lineh-20">
             <span class="color-grey-3 mr20"><%= link_to library.user.show_real_name, user_path(library.user) %></span>
             <span class="color-grey-c mr20"><%= library.visited_count || 0 %> 浏览</span>
-            <span class="color-grey-c mr20">发布时间：<%= library.published_at.try(:strftime, '%Y-%m-%d %H:%M') %></span>
+            <% if params[:type] == 'mine' %>
+              <span class="color-grey-c mr20">上传时间：<%= library.created_at.strftime('%Y-%m-%d %H:%M') %></span>
+            <% else %>
+              <span class="color-grey-c mr20">发布时间：<%= library.published_at.try(:strftime, '%Y-%m-%d %H:%M') %></span>
+            <% end %>
           </p>
         </div>
       </li>
diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb
index 1c23d979..c098b069 100644
--- a/app/views/libraries/show.html.erb
+++ b/app/views/libraries/show.html.erb
@@ -45,15 +45,19 @@
         <% end %>
       </p>
       <div class="df mb20">
-        <img src="<%= url_to_avatar(@library.user) %>" width="50" height="50" class="radius mr15 mt3"/>
+        <%= link_to image_tag(url_to_avatar(@library.user), width: 50, height: 50, class: 'radius mr15 mt3'), user_path(@library.user) %>
         <div class="flex1">
           <li class="font-16"><%= @library.user.show_real_name %></li>
           <li class="clearfix">
             <span class="fl color-grey-9 mr20"><%= @library.user.school_name %></span>
             <span class="fl color-grey-9"><%= @library.user.identity %></span>
             <span class="fr">
-                <span class="fl color-grey-9 mr30">编码：<span class="color-grey-6"><%= @library.uuid %></span></span>
+              <span class="fl color-grey-9 mr30">编码：<span class="color-grey-6"><%= @library.uuid %></span></span>
+              <% if @library.published? %>
+                <span class="fl color-grey-9">发布时间：<span class="color-grey-6"><%= @library.published_at.strftime('%Y-%m-%d %H:%M') %></span></span>
+              <% else %>
                 <span class="fl color-grey-9">上传时间：<span class="color-grey-6"><%= @library.created_at.strftime('%Y-%m-%d %H:%M') %></span></span>
+              <% end %>
             </span>
           </li>
         </div>