Merge branch 'dev' into dev-296

OpenSID · Jul 8, 2024 · 7e02a52 · 7e02a52
2 parents ee89525 + 4f5ddf6
commit 7e02a52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/Http/Controllers/Admin/Wilayah/DesaController.php b/app/Http/Controllers/Admin/Wilayah/DesaController.php
@@ -66,11 +66,14 @@ public function update(RegionRequest $request, $id)
         $input = $request->all();
         $desa = Region::desa()->find($id);
 
-        if ($desa->nama_desa != $input['region_name']) {
+        if ($desa->nama_desa_baru) {
             $input['new_region_name'] = $input['region_name'];
-
-            unset($input['region_name']);
+        } else {
+            if ($desa->nama_desa != $input['region_name']) {
+                $input['new_region_name'] = $input['region_name'];
+            }
         }
+        unset($input['region_name']);
 
         if ($desa->update($input)) {
             return redirect('desa')->with('success', 'Data berhasil diubah');

diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -4,6 +4,8 @@ Di rilis v2401.0.0 berisi perbaikan yang diminta Komunitas Open Desa.
 
 #### Perbaikan Bug
 
+1. [#301](https://github.com/OpenSID/pantau/issues/301) Cek tarik gagal tarik data.
+
 #### Penyesuaian Teknis
 
 1. [#290](https://github.com/OpenSID/pantau/issues/290) Perbaikan gagal nambah desa baru pada pantau.