X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5c8437e59cbfd13b99d402b42b6bdfc18aa82bf8..47221ee04bee623850c559274b5ff64fe3068ae6:/apps/workbench/app/assets/javascripts/select_modal.js
diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index c1267d1d3d..ba106d1110 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -37,20 +37,28 @@ $(document).on('click', '.selectable', function() {
var data = [];
var $modal = $(this).closest('.modal');
var action_data = $(this).data('action-data');
+ var action_data_from_params = $(this).data('action-data-from-params');
var selection_param = action_data.selection_param;
$modal.find('.modal-error').removeClass('hide').hide();
$modal.find('.selectable.active[data-object-uuid]').each(function() {
var val = $(this).attr('data-object-uuid');
data.push({name: selection_param, value: val});
});
- $.each(action_data, function(key, value) {
- data.push({name: key, value: value});
- });
+ $.each($.extend({}, action_data, action_data_from_params),
+ function(key, value) {
+ if (value instanceof Array && key[-1] != ']') {
+ for (var i in value) {
+ data.push({name: key + '[]', value: value[i]});
+ }
+ } else {
+ data.push({name: key, value: value});
+ }
+ });
$.ajax($(this).attr('data-action-href'),
{dataType: 'json',
type: $(this).attr('data-method'),
data: data,
- traditional: true,
+ traditional: false,
context: {modal: $modal, action_data: action_data}}).
fail(function(jqxhr, status, error) {
if (jqxhr.readyState == 0 || jqxhr.status == 0) {
@@ -72,11 +80,14 @@ $(document).on('click', '.selectable', function() {
});
}).on('click', '.chooser-show-project', function() {
var params = {};
+ var project_uuid = $(this).attr('data-project-uuid');
$(this).attr('href', '#'); // Skip normal click handler
- if ($(this).attr('data-project-uuid')) {
- params = {'filters[]': JSON.stringify(['owner_uuid',
- '=',
- $(this).attr('data-project-uuid')])};
+ if (project_uuid) {
+ params = {'filters': [['owner_uuid',
+ '=',
+ project_uuid]],
+ 'project_uuid': project_uuid
+ };
}
// Use current selection as dropdown button label
$(this).
@@ -85,14 +96,54 @@ $(document).on('click', '.selectable', function() {
html($(this).text() + ' ');
// Set (or unset) filter params and refresh filterable rows
$($(this).closest('[data-filterable-target]').attr('data-filterable-target')).
- data('infinite-content-params', params).
+ data('infinite-content-params-from-project-dropdown', params).
trigger('refresh-content');
-});
-$(document).on('page-refresh', function(event, data, status, jqxhr, action_data) {
+}).on('ready', function() {
+ $('form[data-search-modal] a').on('click', function() {
+ $(this).closest('form').submit();
+ return false;
+ });
+ $('form[data-search-modal]').on('submit', function() {
+ // Ask the server for a Search modal. When it arrives, copy
+ // the search string from the top nav input into the modal's
+ // search query field.
+ var $form = $(this);
+ var searchq = $form.find('input').val();
+ var is_a_uuid = /^([0-9a-f]{32}(\+\S+)?|[0-9a-z]{5}-[0-9a-z]{5}-[0-9a-z]{15})$/;
+ if (searchq.trim().match(is_a_uuid)) {
+ window.location = '/actions?uuid=' + encodeURIComponent(searchq.trim());
+ // Show the "loading" indicator. TODO: better page transition hook
+ $(document).trigger('ajax:send');
+ return false;
+ }
+ if ($form.find('a[data-remote]').length > 0) {
+ // A search dialog is already loading.
+ return false;
+ }
+ $('').
+ attr('href', $form.attr('data-search-modal')).
+ attr('data-remote', 'true').
+ attr('data-method', 'GET').
+ hide().
+ appendTo($form).
+ on('ajax:success', function(data, status, xhr) {
+ $('body > .modal-container input[type=text]').
+ val($form.find('input').val()).
+ focus();
+ $form.find('input').val('');
+ }).on('ajax:complete', function() {
+ $(this).detach();
+ }).
+ click();
+ return false;
+ });
+}).on('page-refresh', function(event, data, status, jqxhr, action_data) {
window.location.reload();
}).on('tab-refresh', function(event, data, status, jqxhr, action_data) {
$(document).trigger('arv:pane:reload:all');
$('body > .modal-container .modal').modal('hide');
}).on('redirect-to-created-object', function(event, data, status, jqxhr, action_data) {
window.location.href = data.href.replace(/^[^\/]*\/\/[^\/]*/, '');
+}).on('shown.bs.modal', 'body > .modal-container .modal', function() {
+ $('.focus-on-display', this).focus();
});