Merge pull request #617 from sparc-request/jl-reconfig-for-complete-3

Jl reconfig for complete 3
sparc-request · Aug 9, 2016 · 812cba7 · 812cba7
2 parents e1cdd58 + 3768bc2
commit 812cba7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
@@ -24,7 +24,7 @@ class SearchController < ApplicationController
   def services
     term              = params[:term].strip
     service_request   = ServiceRequest.find(session[:service_request_id])
-    locked_ssrs       = service_request.sub_service_requests.reject{ |ssr| ssr.can_be_edited? && !ssr.is_complete?}
+    locked_ssrs       = service_request.sub_service_requests.reject{ |ssr| ssr.can_be_edited? }
     locked_org_ids    = locked_ssrs.map(&:organization_id)
     locked_child_ids  = Organization.authorized_child_organizations(locked_org_ids).map(&:id)
 

diff --git a/app/controllers/service_requests_controller.rb b/app/controllers/service_requests_controller.rb
@@ -412,12 +412,14 @@ def remove_service
     end
 
     @line_items.where(service_id: service.id).each do |li|
-      ssr = li.sub_service_request
-      if ssr.can_be_edited? && ssr.status != 'first_draft'
-        ssr.update_attribute(:status, 'draft')
-        ssr.update_past_status(current_user)
+      if li.status != 'complete'
+        ssr = li.sub_service_request
+        if ssr.can_be_edited? && ssr.status != 'first_draft'
+          ssr.update_attribute(:status, 'draft')
+          ssr.update_past_status(current_user)
+        end
+        li.destroy
       end
-      li.destroy
     end
 
     @line_items.reload