From ce461a403b64daa362a764784094568fa4e66ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 23 Jul 2021 11:34:16 +0200 Subject: [PATCH] Change projects table to sites table --- app/Console/Commands/CreateUser.php | 2 +- app/Http/Controllers/ProjectController.php | 12 ----- app/Http/Controllers/SiteController.php | 12 +++++ app/Http/Controllers/TicketController.php | 50 +++++++++---------- app/Http/Requests/CreateMessage.php | 2 +- app/Http/Requests/SortTickets.php | 2 +- .../{StoreProject.php => StoreSite.php} | 2 +- app/Http/Requests/StoreTicket.php | 8 +-- .../{UpdateProject.php => UpdateSite.php} | 2 +- app/Http/Requests/UpdateTicket.php | 3 +- app/Models/Message.php | 16 +++--- app/Models/{Project.php => Site.php} | 20 ++++---- app/Models/{ProjectUser.php => SiteUser.php} | 2 +- app/Models/Ticket.php | 16 +++--- app/Models/User.php | 8 +-- app/Policies/AppPolicies.php | 2 +- .../{ProjectPolicy.php => SitePolicy.php} | 2 +- app/Policies/TicketPolicy.php | 8 +-- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 6 +-- .../2020_11_13_152248_create_projects.php | 2 +- ...06_17_173912_create_project_user_table.php | 10 ++-- ..._28_163755_add_soft_delete_on_projects.php | 2 +- ...rename_projects_table_into_sites_table.php | 40 +++++++++++++++ resources/views/emails/new-ticket.blade.php | 2 +- .../views/emails/ticket-mention.blade.php | 2 +- .../views/emails/ticket-update.blade.php | 2 +- resources/views/layout/app.blade.php | 6 +-- resources/views/ticket/form-inputs.blade.php | 14 +++--- resources/views/ticket/index.blade.php | 16 +++--- resources/views/ticket/show.blade.php | 2 +- routes/web.php | 6 +-- 32 files changed, 160 insertions(+), 121 deletions(-) delete mode 100644 app/Http/Controllers/ProjectController.php create mode 100644 app/Http/Controllers/SiteController.php rename app/Http/Requests/{StoreProject.php => StoreSite.php} (93%) rename app/Http/Requests/{UpdateProject.php => UpdateSite.php} (50%) rename app/Models/{Project.php => Site.php} (82%) rename app/Models/{ProjectUser.php => SiteUser.php} (78%) rename app/Policies/{ProjectPolicy.php => SitePolicy.php} (78%) create mode 100644 database/migrations/2021_07_23_111336_rename_projects_table_into_sites_table.php diff --git a/app/Console/Commands/CreateUser.php b/app/Console/Commands/CreateUser.php index 42a270f..8003d3b 100644 --- a/app/Console/Commands/CreateUser.php +++ b/app/Console/Commands/CreateUser.php @@ -3,7 +3,7 @@ namespace App\Console\Commands; use App\Enums\Role; -use App\Models\Project; +use App\Models\Site; use App\Models\User; use Illuminate\Console\Command; use Illuminate\Database\Eloquent\ModelNotFoundException; diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php deleted file mode 100644 index ab43dd2..0000000 --- a/app/Http/Controllers/ProjectController.php +++ /dev/null @@ -1,12 +0,0 @@ -user(); - $tickets = Ticket::with('project')->has('project'); + $tickets = Ticket::with('site')->has('site'); if (!$user->isAdmin()) { - $tickets = $tickets->whereHas('project', function ($q) use ($user) { + $tickets = $tickets->whereHas('site', function ($q) use ($user) { $q->whereHas('users', function ($q) use ($user) { $q->whereId($user->id); }); @@ -50,9 +50,9 @@ class TicketController extends Controller $tickets = $this->filterTickets($tickets, $request); $tickets = $tickets->paginate(); - $projects = Project::select('id', 'name')->orderBy('name')->get(); + $sites = Site::select('id', 'name')->orderBy('name')->get(); - return view('ticket.index', compact('tickets', 'projects')); + return view('ticket.index', compact('tickets', 'sites')); } private function filterTickets(Builder $tickets, Request $request): Builder @@ -77,14 +77,14 @@ class TicketController extends Controller Session::save(); if (Session::has('tickets.pr')) { - $tickets = $tickets->where('project_id', Session::get('tickets.pr')); + $tickets = $tickets->where('site_id', Session::get('tickets.pr')); } if ( Session::has('tickets.sort_col') and Session::has('tickets.sort_way') and in_array(Session::get('tickets.sort_col'), [ - 'id', 'project_id', 'created_at', 'created_by', + 'id', 'site_id', 'created_at', 'created_by', 'type', 'status' ]) ) { @@ -139,29 +139,29 @@ class TicketController extends Controller { $user = Auth::user(); if ($user->role->value === 1) { - $projects = Project::orderBy('name')->get(); + $sites = Site::orderBy('name')->get(); } else { - $projects = $user->projects; + $sites = $user->sites; } - if (!count($projects)) { - return redirect()->route('project.create') + if (!count($sites)) { + return redirect()->route('site.create') ->with('warning', 'Vous devez tout d\'abord créer un projet pour y ajouter un ticket'); } - return view('ticket.create', compact('projects')); + return view('ticket.create', compact('sites')); } public function store(StoreTicket $request) { - $project = Project::findOrFail($request->project_id); + $site = Site::findOrFail($request->site_id); $ticket = new Ticket($request->validated()); if ($request->file_ticket) { - $ticket->file = Ticket::saveFile($project, $ticket, $ticket->type, $request->file_ticket); + $ticket->file = Ticket::saveFile($site, $ticket, $ticket->type, $request->file_ticket); } if ($request->file_ticket2) { - $ticket->file2 = Ticket::saveFile($project, $ticket, $ticket->type, $request->file_ticket2); + $ticket->file2 = Ticket::saveFile($site, $ticket, $ticket->type, $request->file_ticket2); } if ($request->type === TicketType::evolution()) { @@ -188,29 +188,29 @@ class TicketController extends Controller { $user = Auth::user(); if ($user->role->value === 1) { - $projects = Project::orderBy('name')->get(); + $sites = Site::orderBy('name')->get(); } else { - $projects = $user->projects; + $sites = $user->sites; } - return view('ticket.edit', compact('ticket', 'projects')); + return view('ticket.edit', compact('ticket', 'sites')); } public function update(UpdateTicket $request, Ticket $ticket) { - $project = Project::findOrFail($request->project_id); + $site = Site::findOrFail($request->site_id); $ticket->fill($request->validated()); if ($request->file_ticket) { if (File::exists($ticket->file)) { File::delete($ticket->file); } - $ticket->file = Ticket::saveFile($project, $ticket, $ticket->type, $request->file_ticket); + $ticket->file = Ticket::saveFile($site, $ticket, $ticket->type, $request->file_ticket); } if ($request->file_ticket2) { if (File::exists($ticket->file2)) { File::delete($ticket->file2); } - $ticket->file2 = Ticket::saveFile($project, $ticket, $ticket->type, $request->file_ticket2); + $ticket->file2 = Ticket::saveFile($site, $ticket, $ticket->type, $request->file_ticket2); } $ticket->save(); @@ -247,11 +247,11 @@ class TicketController extends Controller } if ($request->file_message) { - $projectSlug = Str::slug($ticket->project->name); + $siteSlug = Str::slug($ticket->site->name); $fileMessage = $request->file_message; - $fileName = $projectSlug . '-ticket-' . $ticket->id . '-message-' . $message->id . '.' . $fileMessage->extension(); - $fileMessage->move(public_path('fichiers/' . $projectSlug . '/' . $ticket->id . '/'), $fileName); - $filePath = 'fichiers/' . $projectSlug . '/' . $ticket->id . '/' . $fileName; + $fileName = $siteSlug . '-ticket-' . $ticket->id . '-message-' . $message->id . '.' . $fileMessage->extension(); + $fileMessage->move(public_path('fichiers/' . $siteSlug . '/' . $ticket->id . '/'), $fileName); + $filePath = 'fichiers/' . $siteSlug . '/' . $ticket->id . '/' . $fileName; $message->file = $filePath; } diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php index 301635e..71b5086 100644 --- a/app/Http/Requests/CreateMessage.php +++ b/app/Http/Requests/CreateMessage.php @@ -20,7 +20,7 @@ class CreateMessage extends FormRequest 'subscribe' => $this->subscribe ? true : false ]); return auth()->check() and ($user->isAdmin() or - auth()->user()->projects->contains(request()->route()->ticket->project_id)); + auth()->user()->sites->contains(request()->route()->ticket->site_id)); } /** diff --git a/app/Http/Requests/SortTickets.php b/app/Http/Requests/SortTickets.php index d60352f..a70b880 100644 --- a/app/Http/Requests/SortTickets.php +++ b/app/Http/Requests/SortTickets.php @@ -38,7 +38,7 @@ class SortTickets extends FormRequest } } ], - 'pr' => 'sometimes|int|exists:projects,id' + 'pr' => 'sometimes|int|exists:sites,id' ]; } } diff --git a/app/Http/Requests/StoreProject.php b/app/Http/Requests/StoreSite.php similarity index 93% rename from app/Http/Requests/StoreProject.php rename to app/Http/Requests/StoreSite.php index 46fb91a..e8a5fa2 100644 --- a/app/Http/Requests/StoreProject.php +++ b/app/Http/Requests/StoreSite.php @@ -5,7 +5,7 @@ namespace App\Http\Requests; use App\Enums\Role; use Illuminate\Foundation\Http\FormRequest; -class StoreProject extends FormRequest +class StoreSite extends FormRequest { /** * Determine if the user is authorized to make this request. diff --git a/app/Http/Requests/StoreTicket.php b/app/Http/Requests/StoreTicket.php index 71f08a3..7ea4ea8 100644 --- a/app/Http/Requests/StoreTicket.php +++ b/app/Http/Requests/StoreTicket.php @@ -34,9 +34,9 @@ class StoreTicket extends FormRequest public function rules() { return [ - 'project_id' => [ + 'site_id' => [ 'required', - 'exists:projects,id', + 'exists:sites,id', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed function ($attribute, $value, $fail) { /** @var \App\Models\User */ @@ -44,9 +44,9 @@ class StoreTicket extends FormRequest if ($user->isAdmin()) { return; } - if (!in_array($value, $user->projects()->pluck('id')->all())) { + if (!in_array($value, $user->sites()->pluck('id')->all())) { $fail(__('Veuillez choisir entre :values', [ - 'values' => $user->projects()->pluck('name')->implode(',') + 'values' => $user->sites()->pluck('name')->implode(',') ])); } } diff --git a/app/Http/Requests/UpdateProject.php b/app/Http/Requests/UpdateSite.php similarity index 50% rename from app/Http/Requests/UpdateProject.php rename to app/Http/Requests/UpdateSite.php index 2cc5353..350d7a8 100644 --- a/app/Http/Requests/UpdateProject.php +++ b/app/Http/Requests/UpdateSite.php @@ -2,6 +2,6 @@ namespace App\Http\Requests; -class UpdateProject extends StoreProject +class UpdateSite extends StoreSite { } diff --git a/app/Http/Requests/UpdateTicket.php b/app/Http/Requests/UpdateTicket.php index 3dae5a1..0833698 100644 --- a/app/Http/Requests/UpdateTicket.php +++ b/app/Http/Requests/UpdateTicket.php @@ -12,8 +12,7 @@ class UpdateTicket extends StoreTicket /** @var \App\Models\User */ $user = auth()->user(); if (!$user->isAdmin()) { - $this->merge([ - 'status' => $this->project->status->value, + $this->merge(['status' => $this->site->status->value, ]); } return auth()->check() and ($user->isAdmin() or diff --git a/app/Models/Message.php b/app/Models/Message.php index f338502..3af559f 100644 --- a/app/Models/Message.php +++ b/app/Models/Message.php @@ -38,7 +38,7 @@ class Message extends Model // find @user + send mail si un seul user est trouvé $usersNotified = collect([]); $matches = []; - $ticket->load('project'); + $ticket->load('site'); \preg_match_all('/@\w*/', $message->message, $matches); $matches = collect($matches[0] ?? [])->unique(); foreach ($matches as $pseudo_usertag) { @@ -46,8 +46,8 @@ class Message extends Model $user = User::where('name', 'LIKE', '%' . ltrim($pseudo_usertag, '@') . '%') ->where('email', '!=', $ticket->user->email) ->where(function ($q) use ($ticket) { - $q->whereHas('projects', function ($q) use ($ticket) { - $q->where('id', $ticket->project->id); + $q->whereHas('sites', function ($q) use ($ticket) { + $q->where('id', $ticket->site->id); })->orWhere('role', Role::admin()->value) ->orWhere('role', Role::developper()->value); })->firstOrFail(); @@ -90,18 +90,18 @@ class Message extends Model return $this->belongsTo(User::class, 'user_id'); } - public function saveFile(Project $project, Ticket $ticket, UploadedFile $file) + public function saveFile(Site $site, Ticket $ticket, UploadedFile $file) { - $projectAssetFullPath = Project::ticketAssetsFullPath($project->slug_name); - $fileAssetPath = Project::ticketAssetsPath($project->slug_name); + $siteAssetFullPath = Site::ticketAssetsFullPath($site->slug_name); + $fileAssetPath = Site::ticketAssetsPath($site->slug_name); $fileName = sprintf( '%s-%s-%d-%d.%s', - $project->slug_name, + $site->slug_name, $ticket->id, rand(), $file->extension() ); - $file->move(sprintf('%s/messages/%d', $projectAssetFullPath, $ticket->id), $fileName); + $file->move(sprintf('%s/messages/%d', $siteAssetFullPath, $ticket->id), $fileName); return sprintf('%s/%d/%s', $fileAssetPath, $ticket->id, $fileName); } } diff --git a/app/Models/Project.php b/app/Models/Site.php similarity index 82% rename from app/Models/Project.php rename to app/Models/Site.php index e2946da..01f7d78 100644 --- a/app/Models/Project.php +++ b/app/Models/Site.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\File; use Illuminate\Support\Str; -class Project extends Model +class Site extends Model { use HasFactory; use IsCrudModel; @@ -67,24 +67,24 @@ class Project extends Model protected static function booted() { - static::created(function (Project $project) { - $path = Project::ticketAssetsFullPath($project->slug_name); + static::created(function (Site $site) { + $path = Site::ticketAssetsFullPath($site->slug_name); if (!File::exists($path)) { File::makeDirectory($path, 0755, true); } }); - static::updating(function (Project $project) { - $oldName = Project::where('id', $project->id)->first()->name; - $oldPath = Project::ticketAssetsFullPath($oldName); - $newPath = Project::ticketAssetsFullPath($project->slug_name); + static::updating(function (Site $site) { + $oldName = Site::where('id', $site->id)->first()->name; + $oldPath = Site::ticketAssetsFullPath($oldName); + $newPath = Site::ticketAssetsFullPath($site->slug_name); if (File::exists($oldPath)) { File::move($oldPath, $newPath); } else { File::makeDirectory($newPath, 0755, true); } }); - static::deleted(function (Project $project) { - $path = Project::ticketAssetsFullPath($project->slug_name); + static::deleted(function (Site $site) { + $path = Site::ticketAssetsFullPath($site->slug_name); if (File::exists($path)) { File::deleteDirectory($path); } @@ -98,7 +98,7 @@ class Project extends Model public function tickets() { - return $this->hasMany(Ticket::class, 'project_id'); + return $this->hasMany(Ticket::class, 'site_id'); } public function getSlugNameAttribute() diff --git a/app/Models/ProjectUser.php b/app/Models/SiteUser.php similarity index 78% rename from app/Models/ProjectUser.php rename to app/Models/SiteUser.php index 5d2558e..a2ce503 100644 --- a/app/Models/ProjectUser.php +++ b/app/Models/SiteUser.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Relations\Pivot; -class ProjectUser extends Pivot +class SiteUser extends Pivot { public $timestamps = false; diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index e68fa87..bca5c2f 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -22,7 +22,7 @@ class Ticket extends Model ]; protected $fillable = [ - 'project_id', + 'site_id', 'type', 'status', 'text' @@ -48,9 +48,9 @@ class Ticket extends Model }); } - public function project() + public function site() { - return $this->belongsTo(Project::class); + return $this->belongsTo(Site::class); } public function user() @@ -68,19 +68,19 @@ class Ticket extends Model return $this->belongsToMany(User::class, 'subscriptions'); } - public static function saveFile(Project $project, Ticket $ticket, TicketType $type, UploadedFile $file) + public static function saveFile(Site $site, Ticket $ticket, TicketType $type, UploadedFile $file) { - $projectAssetFullPath = Project::ticketAssetsFullPath($project->slug_name); - $fileAssetPath = Project::ticketAssetsPath($project->slug_name); + $siteAssetFullPath = Site::ticketAssetsFullPath($site->slug_name); + $fileAssetPath = Site::ticketAssetsPath($site->slug_name); $fileName = sprintf( '%s-%s-%d-%d.%s', - $project->slug_name, + $site->slug_name, $type->getDefinition(), $ticket->id, rand(), $file->extension() ); - $file->move(sprintf('%s/%d', $projectAssetFullPath, $ticket->id), $fileName); + $file->move(sprintf('%s/%d', $siteAssetFullPath, $ticket->id), $fileName); return sprintf('%s/%d/%s', $fileAssetPath, $ticket->id, $fileName); } } diff --git a/app/Models/User.php b/app/Models/User.php index 0be8db9..5240572 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -123,10 +123,10 @@ class User extends Authenticatable CrudAction::update(), ] ], - 'projects' => [ + 'sites' => [ 'label' => trans('Projets'), 'type' => CrudType::belongsToMany(), - 'belongsToMany' => Project::class, + 'belongsToMany' => Site::class, 'belongsToManyLabel' => 'name', 'nullable' => true, 'readonly' => function () { @@ -178,9 +178,9 @@ class User extends Authenticatable return $this->belongsToMany(Ticket::class, 'subscriptions'); } - public function projects() + public function sites() { - return $this->belongsToMany(Project::class); + return $this->belongsToMany(Site::class); } public function sendMailConfirm() diff --git a/app/Policies/AppPolicies.php b/app/Policies/AppPolicies.php index 849952d..deabff6 100644 --- a/app/Policies/AppPolicies.php +++ b/app/Policies/AppPolicies.php @@ -24,7 +24,7 @@ class AppPolicies extends RootPolicy * This first rule to return true in a policy action authorises the action */ $this->policies = [ - 'project' => [ + 'site' => [ 'viewAny' => URR::make('userIsAdmin', $user), 'view' => URR::make('userIsAdmin', $user), 'update' => URR::make('userIsAdmin', $user), diff --git a/app/Policies/ProjectPolicy.php b/app/Policies/SitePolicy.php similarity index 78% rename from app/Policies/ProjectPolicy.php rename to app/Policies/SitePolicy.php index 4ef9498..d9f6c57 100644 --- a/app/Policies/ProjectPolicy.php +++ b/app/Policies/SitePolicy.php @@ -4,7 +4,7 @@ namespace App\Policies; use Illuminate\Auth\Access\HandlesAuthorization; -class ProjectPolicy extends AppPolicies +class SitePolicy extends AppPolicies { use HandlesAuthorization; diff --git a/app/Policies/TicketPolicy.php b/app/Policies/TicketPolicy.php index 5372d80..6581592 100644 --- a/app/Policies/TicketPolicy.php +++ b/app/Policies/TicketPolicy.php @@ -60,7 +60,7 @@ class TicketPolicy */ public function update(User $user, Ticket $ticket) { - return $user->isAdmin() or $user->projects->contains($ticket->project_id); + return $user->isAdmin() or $user->sites->contains($ticket->site_id); } /** @@ -85,7 +85,7 @@ class TicketPolicy */ public function restore(User $user, Ticket $ticket) { - return $user->isAdmin() or $user->projects->contains($ticket->project_id); + return $user->isAdmin() or $user->sites->contains($ticket->site_id); } /** @@ -119,9 +119,9 @@ class TicketPolicy { //can create if //role == 1 - // OR project_id IN user->projects + // OR site_id IN user->sites - if (!($user->isAdmin() or $user->projects->contains($ticket->project_id))) { + if (!($user->isAdmin() or $user->sites->contains($ticket->site_id))) { return Response::deny(trans('Vous ne pouvez modifier un ticket qui ne vous appartient pas.')); } return $ticket->status->equals(TicketStatus::archived()) ? diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 074e26b..565c5af 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -3,7 +3,7 @@ namespace App\Providers; use App\Models\Ticket; -use App\Policies\ProjectPolicy; +use App\Policies\SitePolicy; use App\Policies\TicketPolicy; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 2595412..091d040 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,7 +2,7 @@ namespace App\Providers; -use App\Models\Project; +use App\Models\Site; use App\Models\Ticket; use App\Models\User; use Illuminate\Cache\RateLimiting\Limit; @@ -51,9 +51,9 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/web.php')); }); Route::model('user', User::class); - Route::model('project', Project::class); + Route::model('site', Site::class); Route::bind('ticket', function ($value) { - return Ticket::where('id', $value)->has('project')->firstOrFail(); + return Ticket::where('id', $value)->has('site')->firstOrFail(); }); } diff --git a/database/migrations/2020_11_13_152248_create_projects.php b/database/migrations/2020_11_13_152248_create_projects.php index 132a0b7..92eace6 100644 --- a/database/migrations/2020_11_13_152248_create_projects.php +++ b/database/migrations/2020_11_13_152248_create_projects.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateProjects extends Migration +class CreateSites extends Migration { /** * Run the migrations. diff --git a/database/migrations/2021_06_17_173912_create_project_user_table.php b/database/migrations/2021_06_17_173912_create_project_user_table.php index 88aa981..565f84a 100644 --- a/database/migrations/2021_06_17_173912_create_project_user_table.php +++ b/database/migrations/2021_06_17_173912_create_project_user_table.php @@ -1,13 +1,13 @@ project_id) { - $uP = new ProjectUser(); + $uP = new SiteUser(); $uP->project_id = $user->project_id; $uP->user_id = $user->id; $uP->saveOrFail(); @@ -47,8 +47,8 @@ class CreateProjectUserTable extends Migration $table->foreignId('project_id')->nullable() ->after('role')->constrained('projects'); }); - /** @var \App\Models\ProjectUser */ - foreach (ProjectUser::all() as $uP) { + /** @var \App\Models\SiteUser */ + foreach (SiteUser::all() as $uP) { try { /** @var \App\Models\User */ $user = User::whereId($uP->user_id)->firstOrFail(); diff --git a/database/migrations/2021_06_28_163755_add_soft_delete_on_projects.php b/database/migrations/2021_06_28_163755_add_soft_delete_on_projects.php index b58a5fe..32b84ed 100644 --- a/database/migrations/2021_06_28_163755_add_soft_delete_on_projects.php +++ b/database/migrations/2021_06_28_163755_add_soft_delete_on_projects.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddSoftDeleteOnProjects extends Migration +class AddSoftDeleteOnSites extends Migration { /** * Run the migrations. diff --git a/database/migrations/2021_07_23_111336_rename_projects_table_into_sites_table.php b/database/migrations/2021_07_23_111336_rename_projects_table_into_sites_table.php new file mode 100644 index 0000000..861cc06 --- /dev/null +++ b/database/migrations/2021_07_23_111336_rename_projects_table_into_sites_table.php @@ -0,0 +1,40 @@ +dropForeign('project_user_project_id_foreign'); + $table->renameColumn('project_id ', 'site_id'); + $table->foreignId('site_id')->constrained('sites'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::rename('sites', 'projects'); + Schema::rename('site_user', 'project_user'); + Schema::table('project_user', function (Blueprint $table) { + $table->dropForeign('site_user_site_id_foreign'); + $table->renameColumn('site_id ', 'project_id'); + $table->foreignId('project_id')->constrained('projects'); + }); + } +} diff --git a/resources/views/emails/new-ticket.blade.php b/resources/views/emails/new-ticket.blade.php index 4a48997..27b7297 100644 --- a/resources/views/emails/new-ticket.blade.php +++ b/resources/views/emails/new-ticket.blade.php @@ -1,7 +1,7 @@

Bonjour,

Un nouveau ticket (n°{{ $ticket->id }}) a été créer sur le support web :

diff --git a/resources/views/emails/ticket-mention.blade.php b/resources/views/emails/ticket-mention.blade.php index 12399e8..af5d8af 100644 --- a/resources/views/emails/ticket-mention.blade.php +++ b/resources/views/emails/ticket-mention.blade.php @@ -1,7 +1,7 @@

Bonjour,

Vous avez été mentionné sur le ticket n°{{ $ticket->id }}:

diff --git a/resources/views/emails/ticket-update.blade.php b/resources/views/emails/ticket-update.blade.php index 9b8fcc7..442eda0 100644 --- a/resources/views/emails/ticket-update.blade.php +++ b/resources/views/emails/ticket-update.blade.php @@ -1,7 +1,7 @@

Bonjour,

Le ticket n°{{ $ticket->id }} à été mis à jour :

diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php index 61f020a..bdbb726 100644 --- a/resources/views/layout/app.blade.php +++ b/resources/views/layout/app.blade.php @@ -16,8 +16,8 @@