scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 15:40:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7303 from sboursen-scinote/sb_SCI-10331-fix

Browse source 
Various issues with Reports [SCI-10331]
This commit is contained in:
ajugo 2024-03-18 09:24:57 +01:00 committed by GitHub
commit 521d500b8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/reports_controller.rb
View file

@ -349,7 +349,7 @@ class ReportsController < ApplicationController
@available_repositories = []
repositories = Repository.active
.accessible_by_teams(current_team)
.name_like(search_params[:q])
.name_like(search_params[:query])
.limit(Constants::SEARCH_LIMIT)
repositories.each do |repository|
next unless can_manage_repository_rows?(current_user, repository)
@ -365,7 +365,7 @@ class ReportsController < ApplicationController
end
def search_params
params.permit(:q)
params.permit(:query)
end
def save_pdf_params

6
app/javascript/vue/reports/modals/save_to_inventory.vue
View file

@ -71,7 +71,7 @@ import axios from '../../../packs/custom_axios.js';
import modalMixin from '../../shared/modal_mixin';
export default {
name: 'NewProtocolModal',
name: 'SaveToInventoryModal',
props: {
report: Object,
repositoriesUrl: String,
@ -129,6 +129,10 @@ export default {
});
},
changeRepository(repository) {
if (typeof repository === 'object') {
return;
}
this.selectedColumn = null;
this.selectedRepository = null;
this.selectedRow = null;

1
app/javascript/vue/reports/table.vue
View file

@ -26,6 +26,7 @@
:repositoriesUrl="availableRepositoriesUrl"
:columnsUrl="availableColumnsUrl"
:rowsUrl="availableRowsUrl"
@close="reportToSave = false"
ref="saveToInventoryModal"/>
<UpdateReportModal v-if="promiseToUpdateReport"
@confirm="promiseToUpdateReport.then(confirmReportUpdate)"