فهرست منبع

HUE-1140 HUE File Browser - UTC Time

Since WebHDFS sends all data in epoch time,
convert this to locale specific time defined in hue.ini.
Abraham Elmahrek 13 سال پیش
والد
کامیت
240d4dc
2فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 1 2
      apps/filebrowser/src/filebrowser/templates/listdir_components.mako
  2. 3 0
      apps/filebrowser/src/filebrowser/views.py

+ 1 - 2
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -35,7 +35,6 @@ from django.utils.translation import ugettext as _
 <%def name="_table(files, path, current_request_path, view)">
 <%def name="_table(files, path, current_request_path, view)">
     <script src="/static/ext/js/jquery/plugins/jquery.cookie.js"></script>
     <script src="/static/ext/js/jquery/plugins/jquery.cookie.js"></script>
     <script src="/static/ext/js/knockout-2.1.0.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/ext/js/knockout-2.1.0.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/ext/js/datatables-paging-0.1.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/ext/js/datatables-paging-0.1.js" type="text/javascript" charset="utf-8"></script>
     <style type="text/css">
     <style type="text/css">
       .fixed {
       .fixed {
@@ -859,7 +858,7 @@ from django.utils.translation import ugettext as _
           size:file.humansize,
           size:file.humansize,
           user:file.stats.user,
           user:file.stats.user,
           group:file.stats.group,
           group:file.stats.group,
-          mtime:moment.unix(file.stats.mtime).format("MMMM DD, YYYY hh:mm a")
+          mtime:file.mtime
         },
         },
         selected:ko.observable(false),
         selected:ko.observable(false),
         handleSelect:function (row, e) {
         handleSelect:function (row, e) {

+ 3 - 0
apps/filebrowser/src/filebrowser/views.py

@@ -35,6 +35,8 @@ try:
 except ImportError:
 except ImportError:
   import simplejson as json
   import simplejson as json
 
 
+from datetime import datetime
+
 from django.contrib import messages
 from django.contrib import messages
 from django.contrib.auth.models import User, Group
 from django.contrib.auth.models import User, Group
 from django.core import urlresolvers
 from django.core import urlresolvers
@@ -526,6 +528,7 @@ def _massage_stats(request, stats):
         'path': normalized,
         'path': normalized,
         'name': stats['name'],
         'name': stats['name'],
         'stats': stats.to_json_dict(),
         'stats': stats.to_json_dict(),
+        'mtime': datetime.fromtimestamp(stats['mtime']).strftime('%B %d, %Y %I:%M %p'),
         'humansize': filesizeformat(stats['size']),
         'humansize': filesizeformat(stats['size']),
         'type': filetype(stats['mode']),
         'type': filetype(stats['mode']),
         'rwx': rwx(stats['mode']),
         'rwx': rwx(stats['mode']),