cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-13 22:31:05 +03:30
Code Issues Packages Projects Releases Wiki Activity

fix media

Browse Source
This commit is contained in:
mahdi purHosseini
2023-12-09 20:32:53 +03:30
parent 6e3d883ca0
commit 61ea6071e1
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
-2
View File
@@ -144,7 +144,6 @@ class ItemController extends Controller
$Item = Item::create( [ $Item = Item::create( [
'name' => $request->name , 'name' => $request->name ,
'size' => $request->size , 'size' => $request->size ,
'unique_id' => $request->unique_id ,
'specific' => $request->specific , 'specific' => $request->specific ,
'note' => $request->note , 'note' => $request->note ,
'udi' => $request->udi , 'udi' => $request->udi ,
@@ -167,7 +166,6 @@ class ItemController extends Controller
$Item->update( [ $Item->update( [
'name' => $request->name , 'name' => $request->name ,
'size' => $request->size , 'size' => $request->size ,
'unique_id' => $request->unique_id ,
'specific' => $request->specific , 'specific' => $request->specific ,
'note' => $request->note , 'note' => $request->note ,
'udi' => $request->udi 'udi' => $request->udi
app/Http/Requests/StoreItemRequest.php
+1 -1
View File
@@ -27,7 +27,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'udi' => 'required|max:100|unique:items', // 'udi' => 'required|max:100|unique:items',
]; ];
break; break;
} }
app/Http/Resources/ItemResource.php
-1
View File
@@ -32,7 +32,6 @@ class ItemResource extends JsonResource
'package' => PackageResource::make($this->whenLoaded('package')), 'package' => PackageResource::make($this->whenLoaded('package')),
'transfers' => TransferResource::collection($this->whenLoaded('transfers')), 'transfers' => TransferResource::collection($this->whenLoaded('transfers')),
'files' => MediaResource::collection($this->media), 'files' => MediaResource::collection($this->media),
'thumbnail' => $this->getFirstMediaUrl('main_images', 'thumbnail'),
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'updated_at' => $this->updated_at 'updated_at' => $this->updated_at
]; ];
app/Http/Resources/TestResultResource.php
-1
View File
@@ -34,7 +34,6 @@ class TestResultResource extends JsonResource
'input_values' => $this->when( $this->input_values , $this->input_values ) , 'input_values' => $this->when( $this->input_values , $this->input_values ) ,
'user' => UserResource::make( $this->whenLoaded( 'user' ) ) , 'user' => UserResource::make( $this->whenLoaded( 'user' ) ) ,
'files' => MediaResource::collection( $this->media ) , 'files' => MediaResource::collection( $this->media ) ,
'thumbnail' => $this->getFirstMediaUrl( 'main_images' , 'thumbnail' ) ,
'created_at' => $this->created_at , 'created_at' => $this->created_at ,
'updated_at' => $this->updated_at 'updated_at' => $this->updated_at
]; ];
app/Item.php
+14 -8
View File
@@ -38,19 +38,25 @@ class Item extends Model implements HasMedia
return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" )->whereNull( "to_date" ); return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" )->whereNull( "to_date" );
} }
public function registerMediaCollections() public function registerMediaCollections(): void
{ {
$this->addMediaCollection( 'main_images' ) $this->addMediaCollection( 'main_image' )
->useFallbackUrl( '/images/default_pastry.jpg' ) ->useFallbackUrl( config( 'media-library.wm-cdn' ) . '/images/placeholder/blog-placeholder.jpg' )
->useFallbackPath( public_path( '/images/default_pastry.jpg' ) ); ->useFallbackPath( public_path( '/images/placeholder/blog-placeholder.jpg' ) )
->singleFile();
} }
public function registerMediaConversions( Media $media = null ): void public function registerMediaConversions( Media $media = null )
{ {
$crop = $media->getCustomProperty( 'crop' );
$conversion = $this->addMediaConversion( 'thumbnail' );
$conversion = ! $crop ? $conversion : $conversion->manualCrop( $crop[ 'width' ] , $crop[ 'height' ] , $crop[ 'left' ] , $crop[ 'top' ] );
$conversion->nonQueued()
->performOnCollections( 'main_image' );
$this->addMediaConversion( 'thumbnail' ) $this->addMediaConversion( 'thumbnail' )
->width( 480 ) ->width( 400 )
->height( 640 )
->nonQueued() ->nonQueued()
->performOnCollections( 'main_images' ); ->performOnCollections( 'images' );
} }
} }
app/Services/Media/MediaHelper.php
+3 -3
View File
@@ -14,7 +14,7 @@ class MediaHelper
]); ]);
if ($fakeModel = FakeModel::where('batch_id', request('file_batch_id'))->first()) { if ($fakeModel = FakeModel::where('batch_id', request('file_batch_id'))->first()) {
foreach($fakeModel->getMedia('temp_files') as $media) { foreach($fakeModel->getMedia('temp_medias') as $media) {
if(substr($media->mime_type, 0, 5) == 'image') { if(substr($media->mime_type, 0, 5) == 'image') {
$media->move($model, 'images'); $media->move($model, 'images');
} else { } else {
@@ -58,11 +58,11 @@ class MediaHelper
]); ]);
if ($fakeModel = FakeModel::where('batch_id', request('tinymce_batch_id'))->first()) { if ($fakeModel = FakeModel::where('batch_id', request('tinymce_batch_id'))->first()) {
foreach($fakeModel->getMedia('temp_files') as $media) { foreach($fakeModel->getMedia('temp_medias') as $media) {
if(substr($media->mime_type, 0, 5) == 'image') { if(substr($media->mime_type, 0, 5) == 'image') {
$media->assign($model, 'tinymce_images'); $media->assign($model, 'tinymce_images');
} else { } else {
$media->assign($model, 'tinymce_files'); $media->assign($model, 'temp_medias');
} }
} }
$fakeModel->delete(); $fakeModel->delete();