scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-14 21:24:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into ai-sci-11264-show-file-versions-with-view-permissions

Browse source
This commit is contained in:
Martin Artnik 2024-11-13 14:48:35 +01:00 committed by GitHub
commit 67f142438f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/controllers/global_activities_controller.rb
View file

@ -151,7 +151,25 @@ class GlobalActivitiesController < ApplicationController
end
def activity_filter_params
params.permit(:name, filter: {})
params.permit(
:name,
filter: [
:to_date,
:from_date,
{ types: [] },
{ subjects: {
'Report' => [],
'Project' => [],
'MyModule' => [],
'Protocol' => [],
'Experiment' => [],
'RepositoryRow' => [],
'RepositoryBase' => []
} },
{ users: [] },
{ teams: [] }
]
)
end
def activity_filters

2
app/controllers/reports_controller.rb
View file

@ -361,7 +361,7 @@ class ReportsController < ApplicationController
def report_params
params.require(:report)
.permit(:name, :description, :grouped_by, :report_contents, settings: {})
.permit(:name, :description, :grouped_by, :report_contents, settings: permit_report_settings_structure(Report::DEFAULT_SETTINGS))
end
def search_params

5
app/controllers/search_controller.rb
View file

@ -145,7 +145,10 @@ class SearchController < ApplicationController
def quick
results = if params[:filter].present?
object_quick_search(params[:filter].singularize)
class_name = params[:filter].singularize
return render_422(t('general.invalid_params')) unless Constants::QUICK_SEARCH_SEARCHABLE_OBJECTS.include?(class_name)
object_quick_search(class_name)
else
Constants::QUICK_SEARCH_SEARCHABLE_OBJECTS.filter_map do |object|
next if object == 'label_template' && !LabelTemplate.enabled?

13
app/helpers/reports_helper.rb
View file

@ -106,4 +106,17 @@ module ReportsHelper
experiment_element.experiment.description
end
end
def permit_report_settings_structure(settings_definition)
settings_definition.each_with_object([]) do |(key, value), permitted|
permitted << case value
when Hash
{ key => permit_report_settings_structure(value) }
when Array
{ key => [] }
else
key
end
end
end
end

6
app/javascript/vue/shared/content/attachments/open_locally_menu.vue
View file

@ -134,11 +134,11 @@ export default {
document.getElementById('editImageButton').click();
},
refreshPreview() {
const imageElement = document.querySelector('.file-preview-container .asset-image');
const filePreview = document.querySelector('.file-preview-container');
if (!imageElement) return;
if (!filePreview) return;
$('#filePreviewModal').modal('hide');
window.location.reload();
}
}
};

1
config/locales/en.yml
View file

@ -4305,6 +4305,7 @@ en:
comment_placeholder: "Your Message"
comment_placeholder_new: "Add new comment…"
archived: "Archived"
invalid_params: "Invalid params"
sort:
title: "Sorting"
new_html: "Started last"