Merge pull request #2906 from sparc-request/sj-submission_fixes

SJ - Fixing Service Request Issue
sparc-request · Jun 24, 2022 · ab46b3e · ab46b3e
2 parents c21193a + f63cc3a
commit ab46b3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/line_items_visits_controller.rb b/app/controllers/line_items_visits_controller.rb
@@ -41,7 +41,7 @@ def update
     if @line_items_visit.update_attributes(line_items_visit_params)
       unless @in_admin
         @line_items_visit.sub_service_request.update_attribute(:status, 'draft')
-        @service_request.update_attribute(:status, 'draft')
+        @service_request.update_attribute(:status, 'draft') unless (@service_request.submitted? || @service_request.previously_submitted?)
       end
     else
       @errors = @line_items_visit.errors

diff --git a/app/controllers/service_calendars_controller.rb b/app/controllers/service_calendars_controller.rb
@@ -99,7 +99,7 @@ def toggle_calendar_row
     # Update the sub service request only if we are not in dashboard; admin's actions should not affect the status
     unless @in_admin
       @line_items_visit.sub_service_request.update_attribute(:status, "draft")
-      @service_request.update_attribute(:status, "draft")
+      @service_request.update_attribute(:status, "draft") unless (@service_request.submitted? || @service_request.previously_submitted?)
     end
 
     respond_to :js
@@ -138,7 +138,7 @@ def toggle_calendar_column
     # Update the sub service request only if we are not in dashboard; admin's actions should not affect the status
     unless @in_admin
       editable_ssrs.where.not(status: 'draft').update_all(status: 'draft')
-      @service_request.update_attribute(:status, "draft")
+      @service_request.update_attribute(:status, "draft") unless (@service_request.submitted? || @service_request.previously_submitted?)
     end
 
     respond_to :js