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

Fix inventory card view for snapshots as default view

Browse source
This commit is contained in:
Mojca Lorber 2020-08-05 15:43:43 +02:00
parent 6853caa0c8
commit 3a8fc01ff7
2 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/repository_rows_controller.rb
View file

@ -4,9 +4,9 @@ class RepositoryRowsController < ApplicationController
include ApplicationHelper include ApplicationHelper
include MyModulesHelper include MyModulesHelper
before_action :load_repository before_action :load_repository, except: :show
before_action :load_repository_row, only: %i(update show assigned_task_list) before_action :load_repository_row, only: %i(update assigned_task_list)
before_action :check_read_permissions, except: %i(create update delete_records copy_records) before_action :check_read_permissions, except: %i(show create update delete_records copy_records)
before_action :check_snapshotting_status, only: %i(create update delete_records copy_records) before_action :check_snapshotting_status, only: %i(create update delete_records copy_records)
before_action :check_create_permissions, only: :create before_action :check_create_permissions, only: :create
before_action :check_delete_permissions, only: %i(delete_records archive_records restore_records) before_action :check_delete_permissions, only: %i(delete_records archive_records restore_records)
@ -51,7 +51,12 @@ class RepositoryRowsController < ApplicationController
end end
def show def show
@assigned_modules = @repository_row.my_modules.joins(experiment: :project) @repository_row = RepositoryRow.find_by(id: params[:id])
render_403 unless can_read_repository?(@repository_row.repository)
row = RepositoryRow.find_by(id: @repository_row.parent_id) if @repository_row.parent_id
row ||= @repository_row
@assigned_modules = row.my_modules.joins(experiment: :project)
@viewable_modules = @assigned_modules.viewable_by_user(current_user, current_user.teams) @viewable_modules = @assigned_modules.viewable_by_user(current_user, current_user.teams)
@private_modules = @assigned_modules - @viewable_modules @private_modules = @assigned_modules - @viewable_modules

2
app/views/repositories/_repository_row_info_modal.html.erb
View file

@ -39,7 +39,6 @@
<% end %> <% end %>
</p> </p>
<% if @repository_row.repository.is_a?(Repository) %>
<% if @assigned_modules.size.positive? %> <% if @assigned_modules.size.positive? %>
<div> <div>
<%= t('repository_row.modal_info.title', nr: @assigned_modules.size) %> <%= t('repository_row.modal_info.title', nr: @assigned_modules.size) %>
@ -91,7 +90,6 @@
<% else %> <% else %>
<em><%= t('repository_row.modal_info.no_tasks') %></em> <em><%= t('repository_row.modal_info.no_tasks') %></em>
<% end %> <% end %>
<% end %>
</div> </div>
<script>FilePreviewModal.init()</script> <script>FilePreviewModal.init()</script>
<div class="modal-footer"> <div class="modal-footer">