Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/CMS/CategoryController.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function update($id, UpdateCategoryRequest $request)

$category = $this->categoryRepository->update($request->all(), $id);

Session::flash('success', 'Kategori updated successfully.');
Session::flash('success', 'Kategori berhasil diperbarui.');

return redirect(route('categories.index'));
}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/CMS/DownloadController.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function destroy($id)

$this->downloadRepository->delete($id);
if (request()->ajax()) {
return $this->sendSuccess('Role deleted successfully.');
return $this->sendSuccess('File download berhasil dihapus.');
}
Session::flash('success', 'File download berhasil dihapus.');

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/CMS/SlideController.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function destroy($id)

$this->slideRepository->delete($id);
if (request()->ajax()) {
return $this->sendSuccess('Role deleted successfully.');
return $this->sendSuccess('Slide berhasil dihapus.');
}
Session::flash('success', 'Slide berhasil dihapus.');

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/DepartmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function edit($id)
$department = $this->departmentRepository->find($id);

if (empty($department)) {
Session::flash('error', 'Departemen not found');
Session::flash('error', 'Departemen tidak ditemukan');

return redirect(route('departments.index'));
}
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/PositionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function update($id, UpdatePositionRequest $request)

$position = $this->positionRepository->update($request->all(), $id);

Session::flash('success', 'Jabatan updated successfully.');
Session::flash('success', 'Jabatan berhasil diperbarui.');

return redirect(route('positions.index'));
}
Expand All @@ -126,7 +126,7 @@ public function destroy($id)

$this->positionRepository->delete($id);
if (request()->ajax()) {
return $this->sendSuccess('Role berhasil dihapus.');
return $this->sendSuccess('Jabatan berhasil dihapus.');
}
Session::flash('success', 'Jabatan berhasil dihapus.');

Expand Down
3 changes: 2 additions & 1 deletion app/Http/Transformers/DownloadTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use App\Models\Enums\StatusEnum;
use Illuminate\Support\Facades\Storage;
use League\Fractal\TransformerAbstract;
use Spatie\Html\Facades\Html;

class DownloadTransformer extends TransformerAbstract
{
Expand All @@ -14,7 +15,7 @@ public function transform(Download $download)
return [
'id' => $download->id,
'title' => $download->title,
'url' => $download->url ? link_to(Storage::url($download->url), 'berkas', ['class' => 'text-primary'])->toHtml() : '',
'url' => $download->url ? Html::a(Storage::url($download->url), 'berkas')->class('text-primary')->toHtml() : '',
'description' => $download->description,
'state' => $download->state == StatusEnum::aktif ? 'Tampilkan' : 'Tidak',
'created_at' => $download->created_at,
Expand Down
3 changes: 2 additions & 1 deletion app/Http/Transformers/SlideTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use App\Models\Enums\StatusEnum;
use Illuminate\Support\Facades\Storage;
use League\Fractal\TransformerAbstract;
use Spatie\Html\Facades\Html;

class SlideTransformer extends TransformerAbstract
{
Expand All @@ -14,7 +15,7 @@ public function transform(Slide $slide)
return [
'id' => $slide->id,
'title' => $slide->title,
'url' => $slide->url ? link_to($slide->url, 'tautan', ['class' => 'text-primary'])->toHtml() : '',
'url' => $slide->url ? Html::a($slide->url, 'tautan')->class('text-primary')->toHtml() : '',
'thumbnail' => $slide->thumbnail ? Storage::url($slide->thumbnail) : '',
'description' => $slide->description,
'state' => $slide->state == StatusEnum::aktif ? 'Aktif' : 'Non Aktif',
Expand Down
2 changes: 0 additions & 2 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ public function boot()
{
$this->bootHttps();
$this->addValidation();
// daftarkan manual karena gagal install infyomlabs/adminlte-templates terkendala depedency
View::addNamespace('adminlte-templates', resource_path('views/vendor/adminlte-templates'));
$this->addLogQuery();

if (App::runningInConsole()) {
Expand Down
3 changes: 2 additions & 1 deletion catatan_rilis.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ Di rilis ini, versi 2508.0.1 berisi penambahan dan perbaikan yang diminta penggu

#### Perubahan Teknis

1. [#790](https://github.com/OpenSID/OpenKab/issues/790) Upgrade versi laravel dari 9.52.16 menjadi 10.48.29.
1. [#790](https://github.com/OpenSID/OpenKab/issues/790) Upgrade versi laravel dari 9.52.16 menjadi 10.48.29.
2. [#791](https://github.com/OpenSID/OpenKab/issues/791) Upgrade teknis berdasarkan composer audit pada OpenKab.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"require": {
"php": "^8.1",
"akaunting/laravel-apexcharts": "^3.0",
"akaunting/money": "^5.2",
"alexusmai/laravel-file-manager": "^3.0",
"bensampo/laravel-enum": "^6.3",
"cviebrock/eloquent-sluggable": "^10.0",
Expand All @@ -23,14 +22,14 @@
"laravel/sanctum": "^3.3",
"laravel/tinker": "^2.8",
"laravel/ui": "^4.2",
"laravelcollective/html": "^6.4",
"league/flysystem-ftp": "^3.10",
"openspout/openspout": "^4.24",
"proengsoft/laravel-jsvalidation": "^4.8",
"shetabit/visitor": "^4.1",
"spatie/laravel-activitylog": "^4.7",
"spatie/laravel-csp": "^2.8",
"spatie/laravel-fractal": "^6.0",
"spatie/laravel-html": "^3.5",
"spatie/laravel-json-api-paginate": "^1.13",
"spatie/laravel-permission": "^6.4",
"spatie/laravel-query-builder": "^5.2",
Expand Down
Loading