Merge remote-tracking branch 'upstream/dev' into admin_data_tables_vue

galaxyproject · Dec 15, 2017 · 203630c · 203630c
2 parents 0e13c14 + 9aa596d
commit 203630c
Show file tree

Hide file tree

Showing 219 changed files with 3,482 additions and 2,801 deletions.
diff --git a/.ci/py3_sources.txt b/.ci/py3_sources.txt
diff --git a/client/galaxy/scripts/apps/admin.js b/client/galaxy/scripts/apps/admin.js
@@ -9,9 +9,9 @@ import QueryStringParsing from "utils/query-string-parsing";
 import Router from "layout/router";
 import Utils from "utils/utils";
 import Page from "layout/page";
-import Vue from "libs/vue";
 import UserAPIKeys from "components/admin/UserAPIKeys.vue";
 import DataTables from "components/admin/DataTables.vue";
+import Vue from "vue";
 
 window.app = function app(options, bootstrapped) {
     window.Galaxy = new GalaxyApp.GalaxyApp(options, bootstrapped);
@@ -40,8 +40,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}admin/users_list`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },
@@ -50,8 +49,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}admin/roles_list`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },
@@ -60,8 +58,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}admin/groups_list`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },
@@ -70,8 +67,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}admin_toolshed/browse_repositories`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },
@@ -80,8 +76,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}admin/tool_versions_list`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },
@@ -90,8 +85,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}admin/quotas_list`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },
@@ -112,8 +106,7 @@ window.app = function app(options, bootstrapped) {
             this.page.display(
                 new GridView({
                     url_base: `${Galaxy.root}forms/forms_list`,
-                    url_data: Galaxy.params,
-                    dict_format: true
+                    url_data: Galaxy.params
                 })
             );
         },

diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js
@@ -22,7 +22,7 @@ import Ui from "mvc/ui/ui-misc";
 import DatasetError from "mvc/dataset/dataset-error";
 import DatasetEditAttributes from "mvc/dataset/dataset-edit-attributes";
 import Citations from "components/Citations.vue";
-import Vue from "libs/vue";
+import Vue from "vue";
 
 /** define the 'Analyze Data'/analysis/main/home page for Galaxy
  *  * has a masthead
@@ -47,6 +47,7 @@ window.app = function app(options, bootstrapped) {
             "(/)tours(/)(:tour_id)": "show_tours",
             "(/)user(/)": "show_user",
             "(/)user(/)(:form_id)": "show_user_form",
+            "(/)openids(/)list": "show_openids",
             "(/)pages(/)create(/)": "show_pages_create",
             "(/)pages(/)edit(/)": "show_pages_edit",
             "(/)pages(/)(:action_id)": "show_pages",
@@ -115,8 +116,7 @@ window.app = function app(options, bootstrapped) {
         show_workflows_published: function() {
             this.page.display(
                 new GridView({
-                    url_base: `${Galaxy.root}workflow/list_published`,
-                    dict_format: true
+                    url_base: `${Galaxy.root}workflow/list_published`
                 })
             );
         },
@@ -157,11 +157,18 @@ window.app = function app(options, bootstrapped) {
             );
         },
 
+        show_openids: function() {
+            this.page.display(
+                new GridView({
+                    url_base: `${Galaxy.root}user/openids_list`
+                })
+            );
+        },
+
         show_datasets: function() {
             this.page.display(
                 new GridView({
-                    url_base: `${Galaxy.root}dataset/list`,
-                    dict_format: true
+                    url_base: `${Galaxy.root}dataset/list`
                 })
             );
         },

diff --git a/client/galaxy/scripts/galaxy.interactive_environments.js b/client/galaxy/scripts/galaxy.interactive_environments.js
@@ -6,9 +6,7 @@
 export function append_notebook(url) {
     clear_main_area();
     $("#main").append(
-        `<iframe frameBorder="0" seamless="seamless" style="width: 100%; height: 100%; overflow:hidden;" scrolling="no" src="${
-            url
-        }"></iframe>`
+        `<iframe frameBorder="0" seamless="seamless" style="width: 100%; height: 100%; overflow:hidden;" scrolling="no" src="${url}"></iframe>`
     );
 }
 
@@ -21,9 +19,7 @@ export function clear_main_area() {
 
 export function display_spinner() {
     $("#main").append(
-        `<img id="spinner" src="${
-            galaxy_root
-        }static/style/largespinner.gif" style="position:absolute;margin:auto;top:0;left:0;right:0;bottom:0;">`
+        `<img id="spinner" src="${galaxy_root}static/style/largespinner.gif" style="position:absolute;margin:auto;top:0;left:0;right:0;bottom:0;">`
     );
 }
 

diff --git a/client/galaxy/scripts/galaxy.pages.js b/client/galaxy/scripts/galaxy.pages.js
@@ -154,11 +154,7 @@ WYMeditor.editor.prototype.dialog = function(dialogType, dialogFeatures, bodyHtm
         }
         show_modal(
             "Create Link",
-            `<div><div><label id='link_attribute_label'>URL <span style='float: right; font-size: 90%'><a href='#' id='set_link_id'>Create in-page anchor</a></span></label><br><input type='text' class='wym_href' value='${
-                curURL
-            }' size='40' /></div><div><label>Title</label><br><input type='text' class='wym_title' value='${
-                curTitle
-            }' size='40' /></div><div>`,
+            `<div><div><label id='link_attribute_label'>URL <span style='float: right; font-size: 90%'><a href='#' id='set_link_id'>Create in-page anchor</a></span></label><br><input type='text' class='wym_href' value='${curURL}' size='40' /></div><div><label>Title</label><br><input type='text' class='wym_title' value='${curTitle}' size='40' /></div><div>`,
             {
                 "Make link": function() {
                     // Get URL, name/title.
@@ -332,7 +328,6 @@ WYMeditor.editor.prototype.dialog = function(dialogType, dialogFeatures, bodyHtm
 
         var grid = new GridView({
             url_base: item_info.list_ajax_url,
-            dict_format: true,
             embedded: true
         });
         Galaxy.modal.show({
@@ -426,7 +421,6 @@ WYMeditor.editor.prototype.dialog = function(dialogType, dialogFeatures, bodyHtm
 
         var grid = new GridView({
             url_base: item_info.list_ajax_url,
-            dict_format: true,
             embedded: true
         });
         Galaxy.modal.show({

diff --git a/client/galaxy/scripts/layout/modal.js b/client/galaxy/scripts/layout/modal.js
@@ -154,9 +154,9 @@ function show_in_overlay(options) {
         closeButton: true,
         title: "&nbsp;",
         body: $(
-            `<div style='margin: -5px;'><iframe style='margin: 0; padding: 0;' src='${options.url}' width='${
-                width
-            }' height='${height}' scrolling='${scroll}' frameborder='0'></iframe></div>`
+            `<div style='margin: -5px;'><iframe style='margin: 0; padding: 0;' src='${
+                options.url
+            }' width='${width}' height='${height}' scrolling='${scroll}' frameborder='0'></iframe></div>`
         )
     });
     modal.show({ backdrop: true });