diff --git a/app/Http/Controllers/DossierController.php b/app/Http/Controllers/DossierController.php index cb9eefd..e370cb3 100644 --- a/app/Http/Controllers/DossierController.php +++ b/app/Http/Controllers/DossierController.php @@ -104,7 +104,6 @@ class DossierController extends Controller fn (Builder $q) => $q->where('statut', MediaStatut::public_etendu) ->orWhere('statut', MediaStatut::public) - ->orWhere('created_by', $user->id) ); } Arr::set($folders, 'racineCount', $racineCountQuery->count()); diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 4d64271..a9bdaca 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -488,7 +488,6 @@ class MediaController extends Controller } $clonedMedia->isDefault = true; - $clonedMedia->owner()->associate($user); $clonedMedia->typeMedia()->associate(TypeMedia::getMediaType($clonedMedia->extension)); @@ -892,8 +891,7 @@ class MediaController extends Controller // * OR $esShould = array_merge($esShould, [ \array_undot(['match.statut' => MediaStatut::public_etendu]), - \array_undot(['match.statut' => MediaStatut::public]), - \array_undot(['match.created_by' => $user->id]) + \array_undot(['match.statut' => MediaStatut::public]) ]); return; } //end if @@ -926,10 +924,6 @@ class MediaController extends Controller ]], 'bool.adjust_pure_negative' => true, 'bool.boost' => 1.0 - ]), - \array_undot([ - 'term.created_by.value' => $user->id, - 'term.created_by.boost' => 1.0 ]) ], 'bool.adjust_pure_negative' => true, diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php index 5be1dc2..32c5534 100644 --- a/app/Http/Controllers/UploadController.php +++ b/app/Http/Controllers/UploadController.php @@ -293,7 +293,6 @@ class UploadController extends Controller // * Si on upload un média pour remplacer un fichier par un autre if ($isNewMedia) { $media->libelle = Str::limit($sanitizedFileBasename, 50, ''); - $media->owner()->associate($user); $media->dossier()->associate($dossier); $media->sujet()->associate($sujet); // * Par défaut FR diff --git a/app/Listeners/HistorizeMediaEvent.php b/app/Listeners/HistorizeMediaEvent.php index 29bc00d..dfd4986 100644 --- a/app/Listeners/HistorizeMediaEvent.php +++ b/app/Listeners/HistorizeMediaEvent.php @@ -10,6 +10,7 @@ use App\Events\MediaLinkWithArcadia; use App\Events\MediaMoved; use App\Events\MediaUpdated; use App\Models\Historique; +use \Illuminate\Support\Str; class HistorizeMediaEvent { @@ -54,10 +55,18 @@ class HistorizeMediaEvent $description = trans('Ajout de la liaison Arcadia'); } - $historique->user()->associate($event->getUser()); + $eventUser = $event->getUser(); + + $historique->user()->associate($eventUser); $historique->media()->associate($event->getMedia()); $historique->type = $type; - $historique->description = $description; + $historique->description = sprintf( + '%s - %s %s (%s)', + $description, + $eventUser->firstname, + Str::upper($eventUser->lastname), + $eventUser->matricule + ); if (!$historique->save()) { throw new \RuntimeException('Failed to save historic to Database'); diff --git a/app/Models/Dossier.php b/app/Models/Dossier.php index 06a71c8..2cbd621 100644 --- a/app/Models/Dossier.php +++ b/app/Models/Dossier.php @@ -91,8 +91,7 @@ class Dossier extends Model // * Tous les non brouillons ou liés à une marque du user. return $this->mediaList() - ->where(fn (Builder $q) => $q->where('statut', '!=', MediaStatut::brouillon) - ->orWhere('created_by', $user->id)) + ->where(fn (Builder $q) => $q->where('statut', '!=', MediaStatut::brouillon)) ->count(); } diff --git a/app/Models/Media.php b/app/Models/Media.php index 6b5ddff..ba45e74 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -10,7 +10,6 @@ use App\Events\MediaDestroyed; use App\Events\MediaUpdated; use App\Lib\ToolboxHelper; use App\Traits\Models\BindedToElasticSearch; -use App\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Prunable; use Illuminate\Database\Eloquent\SoftDeletes; @@ -52,7 +51,6 @@ class Media extends Model * @var array */ protected $with = [ - 'owner', 'tags', 'etiquette', 'articles', diff --git a/app/Models/User.php b/app/Models/User.php index df45e7a..9201f1e 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -26,8 +26,6 @@ use Illuminate\Notifications\Notifiable; * Dossiers BelongsToMany relationship. * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> $sujets * Sujets BelongsToMany relationship. - * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Media> $mediaList - * Medias HasMany relationship. * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Historique> $historiques * Historiques HasMany relationship. * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Recherche> $recherches @@ -111,17 +109,6 @@ class User extends Authenticatable return $this->belongsToMany(Sujet::class, 'sujet_user', 'user_id', 'sujet_id'); } - /** - * HasMany media relation - * Get the media for the user. - * - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function mediaList() - { - return $this->hasMany(Media::class); - } - /** * HasMany historiques relation * Get the historiques for the user. diff --git a/database/migrations/2025_11_18_163456_remove_media_created_by.php b/database/migrations/2025_11_18_163456_remove_media_created_by.php new file mode 100644 index 0000000..6abaedf --- /dev/null +++ b/database/migrations/2025_11_18_163456_remove_media_created_by.php @@ -0,0 +1,68 @@ +dropForeign('FK_medias_users'); + $table->dropColumn('created_by'); + }); + + Schema::table('historiques', function(Blueprint $table) { + $table->dropForeign('FK_historiques_users'); + $table->unsignedBigInteger('user_id')->nullable()->change(); + $table->foreign('user_id') + ->references('id') + ->on('users') + ->nullOnDelete(); + }); + // Update 'historiques' descriptions with user datas. + DB::transaction(function () { + DB::statement( + "UPDATE historiques h + JOIN users u ON u.id = h.user_id + SET h.description = CONCAT( + IFNULL(h.description, ''), + ' - ', + u.firstname, ' ', + UPPER(u.lastname), + ' (', u.matricule, ')' + );" + ); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('media', function (Blueprint $table) { + $table->foreignId('created_by')->nullable()->after('commentaire'); + $table->foreign('created_by', 'FK_medias_users')->on('users')->references('id'); + }); + + Schema::table('media', function (Blueprint $table) { + $table->dropForeign('historiques_user_id_foreign'); + $table->unsignedBigInteger('user_id')->nullable()->change(); + $table->foreign('user_id', 'FK_historiques_users') + ->references('id') + ->on('users') + ->cascadeOnDelete(); + }); + } +}; diff --git a/resources/js/admin.js b/resources/js/admin.js index 91c3fa3..54df194 100644 --- a/resources/js/admin.js +++ b/resources/js/admin.js @@ -48,20 +48,10 @@ $(document).ready(function() { // ---- Edition des utilisateurs : suppression d'utilisateur $(".btn_delete_user").on('click', function(event) { event.preventDefault(); - let form = $('.deleteform'), created_by = $('select[name="created_by"]').val(), - created_by_text = $('select[name="created_by"] option:selected').text() - if (!created_by.length) { - $.fancyConfirm({ - title: 'Impossible de lancer cet action.', - message: 'Vous devez choisir autre un utilisateur à qui assigner les fiches.', - okButton: 'Compris', - noButton: 'Retour' - }) - return; - } + let form = $('.deleteform'); $.fancyConfirm({ title: 'Suppression d\'un utilisateur', - message: 'Les média seront assignés à ' + created_by_text + '. Êtes-vous sûr de vouloir supprimer cet utilisateur ?', + message: 'Êtes-vous sûr de vouloir supprimer cet utilisateur ?', okButton: 'Supprimer', noButton: 'Annuler', callback: function (value) { diff --git a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue index 279bd65..cebb36a 100644 --- a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue +++ b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue @@ -41,17 +41,6 @@ > -
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 2201265..2a947c0 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -94,12 +94,6 @@ Annuler {!! Form::model($user, ['route' => ['user.destroy', $user], 'enctype' => 'multipart/form-data', 'class' => 'deleteform floatr']) !!} @method('DELETE') - {!! Form::close() !!}