Merge pull request #4852 from dannon/fix_jsutils_time

Fix jsutils time - fixes charts visualize
galaxyproject · Oct 24, 2017 · fa295c0 · fa295c0
2 parents 2db575b + 546a8c6
commit fa295c0
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/client/galaxy/scripts/apps/admin.js b/client/galaxy/scripts/apps/admin.js
@@ -17,14 +17,14 @@ window.app = function app(options, bootstrapped) {
     /** Routes */
     var AdminRouter = Router.extend({
         routes: {
-            "(/)admin(/)users" : "show_users",
-            "(/)admin(/)roles" : "show_roles",
-            "(/)admin(/)groups" : "show_groups",
-            "(/)admin(/)tool_versions" : "show_tool_versions",
-            "(/)admin(/)quotas" : "show_quotas",
-            "(/)admin(/)repositories" : "show_repositories",
-            "(/)admin(/)forms" : "show_forms",
-            "(/)admin(/)form(/)(:form_id)" : "show_form"
+            "(/)admin(/)users": "show_users",
+            "(/)admin(/)roles": "show_roles",
+            "(/)admin(/)groups": "show_groups",
+            "(/)admin(/)tool_versions": "show_tool_versions",
+            "(/)admin(/)quotas": "show_quotas",
+            "(/)admin(/)repositories": "show_repositories",
+            "(/)admin(/)forms": "show_forms",
+            "(/)admin(/)form(/)(:form_id)": "show_form"
         },
 
         authenticate: function(args, name) {
@@ -64,7 +64,8 @@ window.app = function app(options, bootstrapped) {
         show_repositories: function() {
             this.page.display(
                 new GridView({
-                    url_base: Galaxy.root + "admin_toolshed/browse_repositories",
+                    url_base:
+                        Galaxy.root + "admin_toolshed/browse_repositories",
                     url_data: Galaxy.params,
                     dict_format: true
                 })

diff --git a/client/galaxy/scripts/utils/utils.js b/client/galaxy/scripts/utils/utils.js
@@ -312,7 +312,7 @@ define(["utils/localization"], function(_l) {
         var d = new Date();
         var hours = (d.getHours() < 10 ? "0" : "") + d.getHours();
         var minutes = (d.getMinutes() < 10 ? "0" : "") + d.getMinutes();
-        return (datetime =
+        return (
             d.getDate() +
             "/" +
             (d.getMonth() + 1) +
@@ -321,7 +321,8 @@ define(["utils/localization"], function(_l) {
             ", " +
             hours +
             ":" +
-            minutes);
+            minutes
+        );
     }
 
     /** Append script and style tags to Galaxy main application */

diff --git a/static/maps/utils/utils.js.map b/static/maps/utils/utils.js.map
diff --git a/static/scripts/bundled/admin.bundled.js.map b/static/scripts/bundled/admin.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/utils/utils.js b/static/scripts/utils/utils.js