From 201195393f3172a27fb8e6807d48cf6b19040111 Mon Sep 17 00:00:00 2001 From: Fady Mondy Date: Mon, 19 Dec 2022 18:27:02 +0200 Subject: [PATCH] fix media process on edit --- .DS_Store | Bin 0 -> 8196 bytes Database/.DS_Store | Bin 0 -> 6148 bytes Providers/BaseServiceProvider.php | 1 - Services/.DS_Store | Bin 0 -> 6148 bytes Services/Concerns/HasResource.php | 23 +++++++++++++++++++ Services/Resource/Concerns/Pages/Create.php | 3 ++- Services/Resource/Concerns/Pages/Edit.php | 3 ++- Services/Resource/Concerns/Pages/View.php | 3 ++- Services/Resource/Concerns/Process/Media.php | 2 +- Services/Rows/RelationManager.php | 22 ++++++++++++++++++ Tests/.DS_Store | Bin 0 -> 6148 bytes 11 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 .DS_Store create mode 100644 Database/.DS_Store create mode 100644 Services/.DS_Store create mode 100644 Services/Concerns/HasResource.php create mode 100644 Services/Rows/RelationManager.php create mode 100644 Tests/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3e573161fe33efd26044dcfc4cd7f27903576807 GIT binary patch literal 8196 zcmeI1v2PPG6vp2*NjXH3GM4RNKtf1}jxeR=DitO~SdbVXO&btRFCqyb7;*@~QX$w` zn3)g^`~wV(3=Bx&4=5V~1~&Mf?d1I8yPGOege}?cbpGu3)92(IUx+AJ8Mc>*7KtcC z*)e~l++TXijy&G8mh@mu3=P03V+C=V-$W3%%w%^XbHuzNA z9;*Cej&71M6lny9e%OQ*({&o4wov=DAz5kK6G>J>e>BhTl6=hM9S6ABt6yNBMA&E@DLzx`WScn>KJgvo?pv zV9HV1Twlk>-`;wpJ~O$>%%yUrn{$Hs9#zx5?V&%x8O7 zu9SQ#^E~*NZQzm};q6@X+e~j>KYS8DHs5<|4x6S(BRL`l38|@8kJr(4X|BT0KSyKp z?EZQ_x}w)GN0+T&nNDymyqs_i@p&)!=BxL#oKI+MuBW@NCTo|Y%ecyPf=mAxtI=ik zxpJOG3{6(A&2snbltm~qihPC4uQK>%Zyl)U=@$9?zgqnMe{Yle*}MbZfqmsbP>q}M z3Xsg%+JWPNt+5j^l{aKMZjlLCRwqCZ;;#4$9wo5fE`|XU`VD alKlQ}{gw^<969BR5N*?zN=;Lha?j%`{=pyM&a7>M(>Q_? zLTFc7kFy=yn~9r^iAar~^AXXIh+;Tnua72R{5yNgdM+{mDlAIYP6~7$b26v0Yb$Gs_%zwz-KDJgqqg(8% zCHB??Ij)f9hIg3Hi!QNlkmu+4diDO9V+Z#u%kQ|&Jo*1ar<7su&nbuRjx$vEZHAxQ zW?$=fG>@-cH!F}2=OiWyhytQONCDJrw)otlw4#70APUq9@cTi-854(A=m$#?(=_hkX(rZqQJjWKt*Ymj&Vz_wzh7LYpsSqz}c8rS*(Yk iV@ff&T#7H?#t_%s0VWPBi-^GFL%_%&jVSP|3VZ-GOLb=e literal 0 HcmV?d00001 diff --git a/Providers/BaseServiceProvider.php b/Providers/BaseServiceProvider.php index cf6906e..e7d187a 100644 --- a/Providers/BaseServiceProvider.php +++ b/Providers/BaseServiceProvider.php @@ -29,7 +29,6 @@ class BaseServiceProvider extends ServiceProvider */ public function boot() { - VILT::registerMenu(Menu::make('Dashboard')->label('global.dashboard')->icon('bx bx-home')->route('dashboard')->sort(0)); VILT::registerMenu(Menu::make('Profile')->label('global.profile')->icon('bx bxs-user')->key('profile')->route('profile.show')); $this->registerConfig(); $this->loadViewsFrom(module_path($this->moduleName, 'Resources/views'), 'base'); diff --git a/Services/.DS_Store b/Services/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..78d29405b196ea96ee18b7fd87c6ea15fab1394f GIT binary patch literal 6148 zcmeHKy-EW?5T4Z&LSkWIq1_dNb{c$vGoD~6rV~NUk6M^qNR+gPSZE`H_#FBMHWofa zT0ux*;{*83?h<#+C1@ieGqC&J&Cc9>`HtJk5|JvM)rv$jM3lo|4Dy&VjMsS#*@X4X z0+oJ7LQSe;oKj~fS{$N)DDc-5;BPli>y%J~T9^ml@5xcITumA+LwNOVR9qv8etP#%^BCm1^|RK!x{CK}=&=nYI(Tbm&;zP? z_0{5XR*cKz`mu0%cVqSV@+_CnxHykjaKpR;@Jgur_5Cbexoa+uz3$X|WZugl*R7wm z?$uQ(*A@Gj0_fRnxq?BNMFCMj6c{ML`$LGq7+FjW>a7ElJ^}y(xV7P0_aquery(request(), $this->rows, false); + $this->resource = app($resource)->response($this->rows, $data, app($resource)->table); + return $this; + } +} diff --git a/Services/Resource/Concerns/Pages/Create.php b/Services/Resource/Concerns/Pages/Create.php index 9f4b4e5..fd301ef 100644 --- a/Services/Resource/Concerns/Pages/Create.php +++ b/Services/Resource/Concerns/Pages/Create.php @@ -22,7 +22,8 @@ public function create(Request $request): \Inertia\Response $rows = $this->rows(); return Render::make(ucfirst(Str::camel($this->table)).'/Create')->module($this->module)->data([ "rows" => $rows, - "url" => $this->table + "url" => $this->table, + "trans" => $this->loadTranslations() ])->render(); } } diff --git a/Services/Resource/Concerns/Pages/Edit.php b/Services/Resource/Concerns/Pages/Edit.php index dfee977..696ca8a 100644 --- a/Services/Resource/Concerns/Pages/Edit.php +++ b/Services/Resource/Concerns/Pages/Edit.php @@ -99,7 +99,8 @@ public function edit(Request $request, $id): \Inertia\Response return Render::make(ucfirst(Str::camel($this->table)).'/Edit')->module($this->module)->data([ "rows" => $rows, "record" => $record, - "url" => $this->table + "url" => $this->table, + "trans" => $this->loadTranslations() ])->render(); } } diff --git a/Services/Resource/Concerns/Pages/View.php b/Services/Resource/Concerns/Pages/View.php index 77794cc..b60b9ab 100644 --- a/Services/Resource/Concerns/Pages/View.php +++ b/Services/Resource/Concerns/Pages/View.php @@ -98,7 +98,8 @@ public function view(Request $request, $id){ return Render::make(ucfirst(Str::camel($this->table)).'/View')->module($this->module)->data([ "rows" => $rows, "record" => $record, - "url" => $this->table + "url" => $this->table, + "trans" => $this->loadTranslations() ])->render(); } } diff --git a/Services/Resource/Concerns/Process/Media.php b/Services/Resource/Concerns/Process/Media.php index 9804b58..b0640d9 100644 --- a/Services/Resource/Concerns/Process/Media.php +++ b/Services/Resource/Concerns/Process/Media.php @@ -65,7 +65,7 @@ public function processMediaOnUpdate(Request $request, $record): void } } } - else if(empty($request->get($field->name))){ + else if($field->edit && empty($request->get($field->name))){ $record->clearMediaCollection($field->name); } } diff --git a/Services/Rows/RelationManager.php b/Services/Rows/RelationManager.php new file mode 100644 index 0000000..83de62a --- /dev/null +++ b/Services/Rows/RelationManager.php @@ -0,0 +1,22 @@ +name($name); + } +} diff --git a/Tests/.DS_Store b/Tests/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..665082a3fac2850fd14e9b2d62b851196d398168 GIT binary patch literal 6148 zcmeHKOHRW;47E!ng36-oSk4uCgHQ!7P_bhHrKKP>O$6;e*MW0z2d=~O*hC2l5-Wr% zTk^b#$DYrdD2|DUXZz)pXhK9ORB&{HWT<8 z-5t{vt>}(+)VjZ-YHjzMM^WbaVpA^Qk)Bm=r#BDp7yWsPa`_9d>QUa7&T0u=)0UoS zr*G2mSbGmIAFp3~Xky!|4~-A3+d8m!odIXS88~PLkh4Y7v7)!mfHU9>Gz`f1AwUH) z!&)(ZI?%)t0GPlW1%0U{BqkVUhP5I_AgrN44P`4aSi@lt=9d}PiW*LA#RuEUY!wQ} z)iHmF?!=j*x6Xhw&}HCAA19LkFMqE8yFvcs3^)S^#Q-PyJfGo6mRoy=lUy61w@?xB ms}-9NbYd!oucYF0XcX9kbby&*tq2Rme*_{8-Z%q)%D^W%R7J`F literal 0 HcmV?d00001