mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 05:17:31 -05:00 
			
		
		
		
	set a default task_status for orphaned tasks
This commit is contained in:
		
							parent
							
								
									25fe52ab18
								
							
						
					
					
						commit
						060404cd6c
					
				@ -12,6 +12,7 @@
 | 
				
			|||||||
namespace App\Repositories;
 | 
					namespace App\Repositories;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
use App\Models\Task;
 | 
					use App\Models\Task;
 | 
				
			||||||
 | 
					use App\Models\TaskStatus;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Class for task status repository.
 | 
					 * Class for task status repository.
 | 
				
			||||||
@ -21,10 +22,14 @@ class TaskStatusRepository extends BaseRepository
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	public function delete($task_status)
 | 
						public function delete($task_status)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
 | 
					        $task_status = TaskStatus::where('company_id', $task_status->company_id)
 | 
				
			||||||
 | 
					                                 ->first();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        $new_status = $task_status ? $task_status->id : null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Task::where('status_id', $task_status->id)
 | 
					        Task::where('status_id', $task_status->id)
 | 
				
			||||||
        ->where('company_id', $task_status->company_id)
 | 
					        ->where('company_id', $task_status->company_id)
 | 
				
			||||||
        ->update(['status_id' => null]);
 | 
					        ->update(['status_id' => $new_status]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        parent::delete($task_status);
 | 
					        parent::delete($task_status);
 | 
				
			||||||
@ -36,9 +41,14 @@ class TaskStatusRepository extends BaseRepository
 | 
				
			|||||||
	public function archive($task_status)
 | 
						public function archive($task_status)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        $task_status = TaskStatus::where('company_id', $task_status->company_id)
 | 
				
			||||||
 | 
					                                 ->first();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        $new_status = $task_status ? $task_status->id : null;
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
        Task::where('status_id', $task_status->id)
 | 
					        Task::where('status_id', $task_status->id)
 | 
				
			||||||
        ->where('company_id', $task_status->company_id)
 | 
					        ->where('company_id', $task_status->company_id)
 | 
				
			||||||
        ->update(['status_id' => null]);
 | 
					        ->update(['status_id' => $new_status]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        parent::archive($task_status);
 | 
					        parent::archive($task_status);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user