From ffb31e5cb00e99ea5aaa80be5c8883627b8c688f Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Mon, 8 Jun 2015 12:02:21 +0800
Subject: [PATCH] [starred-file] fix bug when generate file view url

---
 seahub/templates/js/templates.html            | 4 ++--
 static/scripts/app/views/starred-file-item.js | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 9f39a3cde9..a589fb44bc 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -700,9 +700,9 @@
     <td class="alc"><img src="{{ MEDIA_URL }}img/file/<%= icon_path %>" alt="{% trans "icon" %}" /></td>
     <td>
         <% if (is_img) { %>
-            <a class="normal img-name-link" href="{{ SITE_ROOT }}lib/<%= repo %>/file/<%- encoded_path %>" target="_blank" data-mfp-src="{{ SITE_ROOT }}repo/<%= repo %>/raw/<%- encoded_path %>"><%- file_name %></a>
+            <a class="normal img-name-link" href="{{ SITE_ROOT }}lib/<%= repo %>/file<%- encoded_path %>" target="_blank" data-mfp-src="{{ SITE_ROOT }}repo/<%= repo %>/raw<%- encoded_path %>"><%- file_name %></a>
         <% } else { %>
-            <a href="{{ SITE_ROOT }}lib/<%= repo %>/file/<%- encoded_path %>" target="_blank"><%- file_name %></a>
+            <a href="{{ SITE_ROOT }}lib/<%= repo %>/file<%- encoded_path %>" target="_blank"><%- file_name %></a>
         <% } %>
     </td>
     <td>
diff --git a/static/scripts/app/views/starred-file-item.js b/static/scripts/app/views/starred-file-item.js
index 4fea15e098..0e18bb732f 100644
--- a/static/scripts/app/views/starred-file-item.js
+++ b/static/scripts/app/views/starred-file-item.js
@@ -21,11 +21,10 @@ define([
         },
 
         render: function () {
-            var data = this.model.toJSON(),
-                file_name = data['file_name'];
+            var data = this.model.toJSON();
 
-            data['is_img'] = Common.imageCheck(file_name);
-            data['encoded_path'] = Common.encodePath(file_name);
+            data['is_img'] = Common.imageCheck(data['file_name']);
+            data['encoded_path'] = Common.encodePath(data['path']);
 
             this.$el.html(this.template(data));
             return this;