NoMethodError fixes

datadryad · Sep 14, 2024 · 38d3ab0 · 38d3ab0
1 parent ad903d7
commit 38d3ab0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/stash_datacite/resources_controller.rb b/app/controllers/stash_datacite/resources_controller.rb
@@ -56,8 +56,9 @@ def submission
 
  StashEngine.repository.submit(resource_id: @resource_id)
 
- @resource.curation_activities << StashEngine::CurationActivity.create(status: 'processing', note: 'Repository processing data',
- user_id: current_user.id)
+ @resource.curation_activities << StashEngine::CurationActivity.create(
+ status: 'processing', note: 'Repository processing data', user_id: current_user&.id || 0
+ )
 
  @resource.reload
 

diff --git a/app/policies/stash_engine/resource_policy.rb b/app/policies/stash_engine/resource_policy.rb
@@ -19,8 +19,8 @@ def curate?
 
  def curator_edit?
  (curate? &&
- (@resource.current_resource_state.resource_state == 'submitted')) ||
- (@resource.current_resource_state.resource_state == 'in_progress' && @resource.current_editor_id == @user.id)
+ (@resource.current_resource_state&.resource_state == 'submitted')) ||
+ (@resource.current_resource_state&.resource_state == 'in_progress' && @resource&.current_editor_id == @user.id)
  end
 
  class Scope