diff --git a/app/assets/javascripts/assets.js b/app/assets/javascripts/assets.js
index 3ff983bfb..95fc8362d 100644
--- a/app/assets/javascripts/assets.js
+++ b/app/assets/javascripts/assets.js
@@ -44,7 +44,7 @@ function setupAssetsLoading() {
);
}
animateSpinner(null, false);
- initPreviewModal();
+ FilePreviewModal.init();
},
error: function(data) {
if (data.status == 403) {
diff --git a/app/assets/javascripts/my_modules/results.js.erb b/app/assets/javascripts/my_modules/results.js.erb
index f64a696c1..9478b5fdc 100644
--- a/app/assets/javascripts/my_modules/results.js.erb
+++ b/app/assets/javascripts/my_modules/results.js.erb
@@ -186,7 +186,7 @@
ResutlAssets.applyEditResultAssetCallback();
applyCollapseLinkCallBack();
toggleResultEditButtons(true);
- initPreviewModal();
+ FilePreviewModal.init();
Comments.initialize();
ResutlAssets.initNewResultAsset();
expandResult($(this));
diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index 7a5359e86..319cb8c5c 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -215,7 +215,7 @@ function initProtocolPreviewModal() {
initHandsOnTable(modalBody);
modal.modal("show");
initHandsOnTable(modalBody);
- initPreviewModal();
+ FilePreviewModal.init({ readOnly: true });
},
error: function (error) {
// TODO
diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb
index 07975a2c8..237edbd8c 100644
--- a/app/assets/javascripts/protocols/steps.js.erb
+++ b/app/assets/javascripts/protocols/steps.js.erb
@@ -120,7 +120,7 @@
setTimeout(function() {
$.initTooltips();
initStepsComments();
- initPreviewModal();
+ FilePreviewModal.init();
SmartAnnotation.preventPropagation('.atwho-user-popover');
TinyMCE.destroyAll();
DragNDropSteps.clearFiles();
@@ -148,7 +148,7 @@
toggleButtons(false);
initializeCheckboxSorting();
animateSpinner(null, false);
- initPreviewModal();
+ FilePreviewModal.init();
DragNDropSteps.clearFiles();
TinyMCE.refresh();
$("#new-step-checklists fieldset.nested_step_checklists ul").each(function () {
@@ -233,7 +233,7 @@
initCallBacks();
initHandsOnTable($new_step);
toggleButtons(true);
- initPreviewModal();
+ FilePreviewModal.init();
TinyMCE.destroyAll();
SmartAnnotation.preventPropagation('.atwho-user-popover');
@@ -613,7 +613,7 @@
animateSpinner(null, false);
setupAssetsLoading();
DragNDropSteps.clearFiles();
- initPreviewModal();
+ FilePreviewModal.init();
$.initTooltips();
},
error: function(xhr) {
@@ -676,7 +676,7 @@
expandAllSteps();
setupAssetsLoading();
initStepsComments();
- initPreviewModal();
+ FilePreviewModal.init();
TinyMCE.highlight();
SmartAnnotation.preventPropagation('.atwho-user-popover');
newStepHandler();
diff --git a/app/assets/javascripts/repositories/repository_datatable.js.erb b/app/assets/javascripts/repositories/repository_datatable.js.erb
index f9866d380..7122b9c55 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js.erb
+++ b/app/assets/javascripts/repositories/repository_datatable.js.erb
@@ -134,7 +134,7 @@ var RepositoryDatatable = (function(global) {
changeToViewMode();
updateButtons();
updateDataTableSelectAllCtrl();
- initPreviewModal();
+ FilePreviewModal.init();
// Prevent row toggling when selecting user smart annotation link
SmartAnnotation.preventPropagation('.atwho-user-popover');
@@ -222,7 +222,7 @@ var RepositoryDatatable = (function(global) {
initRowSelection();
bindExportActions();
disableCheckboxToggleOnAssetDownload();
- initPreviewModal();
+ FilePreviewModal.init();
initHeaderTooltip();
}
});
@@ -1135,7 +1135,7 @@ var RepositoryDatatable = (function(global) {
currentMode = 'viewMode';
// Table specific stuff
TABLE.button(0).enable(true);
- initPreviewModal();
+ FilePreviewModal.init();
}
function changeToEditMode() {
@@ -1265,7 +1265,7 @@ var RepositoryDatatable = (function(global) {
TABLE.search(searchText).draw();
}
initRowSelection();
- initPreviewModal();
+ FilePreviewModal.init();
});
}
diff --git a/app/assets/javascripts/results/result_assets.js b/app/assets/javascripts/results/result_assets.js
index 379c52c37..5a2f42aea 100644
--- a/app/assets/javascripts/results/result_assets.js
+++ b/app/assets/javascripts/results/result_assets.js
@@ -50,7 +50,7 @@
$form.remove();
applyEditResultAssetCallback();
Results.toggleResultEditButtons(true);
- initPreviewModal();
+ FilePreviewModal.init();
});
Results.toggleResultEditButtons(false);
@@ -72,7 +72,7 @@
Results.toggleResultEditButtons(true);
Results.expandResult($newResult);
- initPreviewModal();
+ FilePreviewModal.init();
Comments.initialize();
initNewResultAsset();
}).on('ajax:error', function(e, xhr) {
@@ -98,5 +98,5 @@
ResutlAssets.initNewResultAsset();
ResutlAssets.applyEditResultAssetCallback();
- global.initPreviewModal();
+ FilePreviewModal.init();
}(window));
diff --git a/app/assets/javascripts/sitewide/drag_n_drop.js.erb b/app/assets/javascripts/sitewide/drag_n_drop.js.erb
index 221c112c0..0a84c93cc 100644
--- a/app/assets/javascripts/sitewide/drag_n_drop.js.erb
+++ b/app/assets/javascripts/sitewide/drag_n_drop.js.erb
@@ -494,7 +494,7 @@
ResutlAssets.applyEditResultAssetCallback();
Results.applyCollapseLinkCallBack();
Results.toggleResultEditButtons(true);
- initPreviewModal();
+ FilePreviewModal.init();
Comments.initialize();
ResutlAssets.initNewResultAsset();
Results.expandResult($(this));
diff --git a/app/assets/javascripts/sitewide/file_preview.js b/app/assets/javascripts/sitewide/file_preview.js
index 2305061eb..6ebc2b71f 100644
--- a/app/assets/javascripts/sitewide/file_preview.js
+++ b/app/assets/javascripts/sitewide/file_preview.js
@@ -3,13 +3,17 @@
/* global fabric tui animateSpinner setupAssetsLoading I18n*/
//= require assets
-(function(global) {
+var FilePreviewModal = (function() {
'use strict';
- global.initPreviewModal = function initPreviewModal() {
+ var readOnly = false;
+
+ function initPreviewModal(options = {}) {
var name;
var url;
var downloadUrl;
+ readOnly = options.readOnly;
+
$('.file-preview-link').off('click');
$('.file-preview-link').click(function(e) {
e.preventDefault();
@@ -18,7 +22,7 @@
downloadUrl = $(this).attr('href');
openPreviewModal(name, url, downloadUrl);
});
- };
+ }
// Adding rotation icon
function updateFabricControls() {
@@ -336,7 +340,7 @@
.click(function(ev) {
ev.stopPropagation();
}));
- if (data.editable) {
+ if (!readOnly && data.editable) {
modal.find('.file-edit-link').css('display', '');
modal.find('.file-edit-link').off().click(function(ev) {
ev.preventDefault();
@@ -349,8 +353,12 @@
}
}
} else {
+ modal.find('.file-edit-link').css('display', 'none');
modal.find('.file-preview-container').html(data['preview-icon']);
}
+ if (readOnly) {
+ modal.find('#wopi_file_edit_button').remove();
+ }
if (data.processing) {
checkFileReady(url, modal);
}
@@ -410,4 +418,8 @@
}
});
}
+
+ return Object.freeze({
+ init: initPreviewModal
+ });
}(window));
diff --git a/app/assets/javascripts/sitewide/repository_row_info_modal.js b/app/assets/javascripts/sitewide/repository_row_info_modal.js
index 8bb3eb172..af74b1da7 100644
--- a/app/assets/javascripts/sitewide/repository_row_info_modal.js
+++ b/app/assets/javascripts/sitewide/repository_row_info_modal.js
@@ -16,7 +16,7 @@
$(this).find('.modal-body #repository_row-info-table').DataTable().destroy();
$(this).remove();
});
- initPreviewModal();
+ FilePreviewModal.init();
$('#repository_row-info-table').DataTable({
dom: 'RBltpi',
stateSave: false,
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 52b58478d..a0bd0416e 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -48,17 +48,24 @@ class AssetsController < ApplicationController
'type' => (@asset.is_image? ? 'image' : 'file'),
'filename' => truncate(@asset.file_file_name,
- length:
- Constants::FILENAME_TRUNCATION_LENGTH),
- 'download-url' => download_asset_path(@asset, timestamp: Time.now.to_i),
- 'editable' => @asset.editable?(current_user)
+ length: Constants::FILENAME_TRUNCATION_LENGTH),
+ 'download-url' => download_asset_path(@asset, timestamp: Time.now.to_i)
}
+ can_edit = if @assoc.class == Step
+ can_manage_protocol_in_module?(@protocol) || can_manage_protocol_in_repository?(@protocol)
+ elsif @assoc.class == Result
+ can_manage_module?(@my_module)
+ elsif @assoc.class == RepositoryCell
+ can_manage_repository_rows?(@repository.team)
+ end
+
if @asset.is_image?
response_json.merge!(
- 'processing' => @asset.file.processing?,
+ 'editable' => @asset.editable_image? && can_edit,
+ 'processing' => @asset.file.processing?,
'large-preview-url' => @asset.url(:large),
- 'processing-url' => image_tag('medium/processing.gif')
+ 'processing-url' => image_tag('medium/processing.gif')
)
else
response_json.merge!(
@@ -71,15 +78,6 @@ class AssetsController < ApplicationController
end
if wopi_file?(@asset)
- can_edit =
- if @assoc.class == Step
- can_manage_protocol_in_module?(@protocol) ||
- can_manage_protocol_in_repository?(@protocol)
- elsif @assoc.class == Result
- can_manage_module?(@my_module)
- elsif @assoc.class == RepositoryCell
- can_manage_repository_rows?(@repository.team)
- end
edit_supported, title = wopi_file_edit_button_status
response_json['wopi-controls'] = render_to_string(
partial: 'shared/file_wopi_controlls.html.erb',
diff --git a/app/models/asset.rb b/app/models/asset.rb
index ff3a96ae9..1e11136ad 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -465,13 +465,8 @@ class Asset < ApplicationRecord
save
end
- def editable?(user)
- objects = %w(step result)
- my_module = send(objects.find { |object| send(object) }).my_module
- Canaid::PermissionsHolder.instance.eval(:manage_experiment, user, my_module.experiment) &&
- !locked? &&
- %r{^image/#{Regexp.union(Constants::WHITELISTED_IMAGE_TYPES_EDITABLE)}} ===
- file.content_type
+ def editable_image?
+ !locked? && %r{^image/#{Regexp.union(Constants::WHITELISTED_IMAGE_TYPES_EDITABLE)}} =~ file.content_type
end
protected
diff --git a/app/views/my_modules/archive.html.erb b/app/views/my_modules/archive.html.erb
index b68cafe65..21dce5ff1 100644
--- a/app/views/my_modules/archive.html.erb
+++ b/app/views/my_modules/archive.html.erb
@@ -21,4 +21,4 @@
<% end %>
-
+
diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb
index 490fdeacc..b74cf93a7 100644
--- a/app/views/repositories/_repository_row_info_modal.html.erb
+++ b/app/views/repositories/_repository_row_info_modal.html.erb
@@ -80,7 +80,7 @@
<%=t "repository_row.modal_info.no_tasks" %>
<% end %>
-
+
diff --git a/app/views/shared/_file_wopi_controlls.html.erb b/app/views/shared/_file_wopi_controlls.html.erb
index 07762f7d7..836c91b72 100644
--- a/app/views/shared/_file_wopi_controlls.html.erb
+++ b/app/views/shared/_file_wopi_controlls.html.erb
@@ -1,4 +1,5 @@
<%= link_to view_asset_url(id: asset),
+ id: 'wopi_file_view_button',
class: 'btn btn-default btn-sm',
target: '_blank',
style: 'display: inline-block' do %>
@@ -7,6 +8,7 @@
<% end %>
<% if can_edit && edit_supported %>
<%= link_to edit_asset_url(id: asset),
+ id: 'wopi_file_edit_button',
class: 'btn btn-default btn-sm',
target: '_blank',
style: 'display: inline-block' do %>
@@ -15,6 +17,7 @@
<% end %>
<% elsif can_edit %>
<%= link_to edit_asset_url(id: asset),
+ id: 'wopi_file_edit_button',
class: 'btn btn-default btn-sm',
target: '_blank',
title: title,