X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8dcb4daaa7e740f5957043321ccf2c1a7bd2ccb6..931035f064b020f125daf5b905e87f994528020e:/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 dda230f50b..bd68bc8a2f 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -8,14 +8,19 @@ $(document).on('click', '.selectable', function() {
removeClass('active');
}
$this.toggleClass('active');
- any = ($container.
+
+ if (!$this.hasClass('use-preview-selection')) {
+ any = ($container.
find('.selectable.active').length > 0)
- $this.
+ }
+
+ if (!$container.hasClass('preview-selectable-container')) {
+ $this.
closest('.modal').
find('[data-enable-if-selection]').
prop('disabled', !any);
- if ($this.hasClass('active')) {
+ if ($this.hasClass('active')) {
var no_preview_available = '
(No preview available)';
if (!$this.attr('data-preview-href')) {
$(".modal-dialog-preview-pane").html(no_preview_available);
@@ -30,6 +35,14 @@ $(document).on('click', '.selectable', function() {
fail(function(data, status, jqxhr) {
$(".modal-dialog-preview-pane").html(no_preview_available);
});
+ }
+ } else {
+ any = ($container.
+ find('.preview-selectable.active').length > 0)
+ $(this).
+ closest('.modal').
+ find('[data-enable-if-selection]').
+ prop('disabled', !any);
}
}).on('click', '.modal button[data-action-href]', function() {
@@ -37,20 +50,36 @@ $(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 $preview_selections = $modal.find('.preview-selectable.active');
+ if ($preview_selections.length > 0) {
+ data.push({name: selection_param, value: $preview_selections.first().attr('href')});
+ }
+
+ if (data.length == 0) { // not using preview selection option
+ $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) {