Skip to content

Commit 458e070

Browse files
Merge pull request #2288 from suraj-webkul/issue#2278
Issue #2278 fixed.
2 parents 6fe0390 + 03e8fd9 commit 458e070

File tree

8 files changed

+55
-42
lines changed

8 files changed

+55
-42
lines changed

packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ public function destroy(int $id): JsonResponse
102102
{
103103
$group = $this->groupRepository->findOrFail($id);
104104

105+
if ($group->users()->exists()) {
106+
return response()->json([
107+
'message' => trans('admin::app.settings.groups.index.delete-failed-associated-users'),
108+
], 400);
109+
}
110+
105111
try {
106112
Event::dispatch('settings.group.delete.before', $id);
107113

packages/Webkul/Admin/src/Resources/lang/ar/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -747,12 +747,13 @@
747747

748748
'groups' => [
749749
'index' => [
750-
'create-btn' => 'إنشاء مجموعة',
751-
'title' => 'المجموعات',
752-
'create-success' => 'تم إنشاء المجموعة بنجاح.',
753-
'update-success' => 'تم تحديث المجموعة بنجاح.',
754-
'destroy-success' => 'تم حذف المجموعة بنجاح.',
755-
'delete-failed' => 'لا يمكن حذف المجموعة.',
750+
'create-btn' => 'إنشاء مجموعة',
751+
'title' => 'المجموعات',
752+
'create-success' => 'تم إنشاء المجموعة بنجاح.',
753+
'update-success' => 'تم تحديث المجموعة بنجاح.',
754+
'destroy-success' => 'تم حذف المجموعة بنجاح.',
755+
'delete-failed' => 'لا يمكن حذف المجموعة.',
756+
'delete-failed-associated-users' => 'لا يمكن حذف المجموعة لأنها مستخدمة من قبل المستخدمين.',
756757

757758
'datagrid' => [
758759
'delete' => 'حذف',

packages/Webkul/Admin/src/Resources/lang/en/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -749,12 +749,13 @@
749749

750750
'groups' => [
751751
'index' => [
752-
'create-btn' => 'Create Group',
753-
'title' => 'Groups',
754-
'create-success' => 'Group created successfully.',
755-
'update-success' => 'Group updated successfully.',
756-
'destroy-success' => 'Group deleted successfully.',
757-
'delete-failed' => 'Group can not be deleted.',
752+
'create-btn' => 'Create Group',
753+
'title' => 'Groups',
754+
'create-success' => 'Group created successfully.',
755+
'update-success' => 'Group updated successfully.',
756+
'destroy-success' => 'Group deleted successfully.',
757+
'delete-failed' => 'Group can not be deleted.',
758+
'delete-failed-associated-users' => 'Group can not be deleted, as this is being used by users.',
758759

759760
'datagrid' => [
760761
'delete' => 'Delete',

packages/Webkul/Admin/src/Resources/lang/es/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,13 @@
751751

752752
'groups' => [
753753
'index' => [
754-
'create-btn' => 'Crear Grupo',
755-
'title' => 'Grupos',
756-
'create-success' => 'Grupo creado con éxito.',
757-
'update-success' => 'Grupo actualizado con éxito.',
758-
'destroy-success' => 'Grupo eliminado con éxito.',
759-
'delete-failed' => 'No se puede eliminar el grupo.',
754+
'create-btn' => 'Crear Grupo',
755+
'title' => 'Grupos',
756+
'create-success' => 'Grupo creado con éxito.',
757+
'update-success' => 'Grupo actualizado con éxito.',
758+
'destroy-success' => 'Grupo eliminado con éxito.',
759+
'delete-failed' => 'No se puede eliminar el grupo.',
760+
'delete-failed-associated-users' => 'No se puede eliminar el grupo, ya que está siendo utilizado por usuarios.',
760761

761762
'datagrid' => [
762763
'delete' => 'Eliminar',

packages/Webkul/Admin/src/Resources/lang/fa/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,12 +752,13 @@
752752

753753
'groups' => [
754754
'index' => [
755-
'create-btn' => 'ایجاد گروه',
756-
'title' => 'گروه‌ها',
757-
'create-success' => 'گروه با موفقیت ایجاد شد.',
758-
'update-success' => 'گروه با موفقیت به‌روزرسانی شد.',
759-
'destroy-success' => 'گروه با موفقیت حذف شد.',
760-
'delete-failed' => 'گروه قابل حذف نیست.',
755+
'create-btn' => 'ایجاد گروه',
756+
'title' => 'گروه‌ها',
757+
'create-success' => 'گروه با موفقیت ایجاد شد.',
758+
'update-success' => 'گروه با موفقیت به‌روزرسانی شد.',
759+
'destroy-success' => 'گروه با موفقیت حذف شد.',
760+
'delete-failed' => 'امکان حذف گروه وجود ندارد.',
761+
'delete-failed-associated-users' => 'امکان حذف گروه وجود ندارد زیرا توسط کاربران استفاده می‌شود.',
761762

762763
'datagrid' => [
763764
'delete' => 'حذف',

packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -745,12 +745,13 @@
745745

746746
'groups' => [
747747
'index' => [
748-
'create-btn' => 'Adicionar Grupo',
749-
'title' => 'Grupos',
750-
'create-success' => 'Grupo adicionado com sucesso.',
751-
'update-success' => 'Grupo atualizado com sucesso.',
752-
'destroy-success' => 'Grupo excluído com sucesso.',
753-
'delete-failed' => 'Não foi possível excluir o grupo.',
748+
'create-btn' => 'Criar Grupo',
749+
'title' => 'Grupos',
750+
'create-success' => 'Grupo criado com sucesso.',
751+
'update-success' => 'Grupo atualizado com sucesso.',
752+
'destroy-success' => 'Grupo excluído com sucesso.',
753+
'delete-failed' => 'Não foi possível excluir o grupo.',
754+
'delete-failed-associated-users' => 'Não foi possível excluir o grupo, pois está sendo utilizado por usuários.',
754755

755756
'datagrid' => [
756757
'delete' => 'Excluir',

packages/Webkul/Admin/src/Resources/lang/tr/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,13 @@
751751

752752
'groups' => [
753753
'index' => [
754-
'create-btn' => 'Grup Oluştur',
755-
'title' => 'Gruplar',
756-
'create-success' => 'Grup başarıyla oluşturuldu.',
757-
'update-success' => 'Grup başarıyla güncellendi.',
758-
'destroy-success' => 'Grup başarıyla silindi.',
759-
'delete-failed' => 'Grup silinemedi.',
754+
'create-btn' => 'Grup Oluştur',
755+
'title' => 'Gruplar',
756+
'create-success' => 'Grup başarıyla oluşturuldu.',
757+
'update-success' => 'Grup başarıyla güncellendi.',
758+
'destroy-success' => 'Grup başarıyla silindi.',
759+
'delete-failed' => 'Grup silinemedi.',
760+
'delete-failed-associated-users' => 'Grup silinemiyor, çünkü kullanıcılar tarafından kullanılıyor.',
760761

761762
'datagrid' => [
762763
'delete' => 'Sil',

packages/Webkul/Admin/src/Resources/lang/vi/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -748,12 +748,13 @@
748748

749749
'groups' => [
750750
'index' => [
751-
'create-btn' => 'Tạo Nhóm',
752-
'title' => 'Nhóm',
753-
'create-success' => 'Nhóm đã được tạo thành công.',
754-
'update-success' => 'Nhóm đã được cập nhật thành công.',
755-
'destroy-success' => 'Nhóm đã được xóa thành công.',
756-
'delete-failed' => 'Không thể xóa nhóm.',
751+
'create-btn' => 'Tạo Nhóm',
752+
'title' => 'Nhóm',
753+
'create-success' => 'Tạo nhóm thành công.',
754+
'update-success' => 'Cập nhật nhóm thành công.',
755+
'destroy-success' => 'Xóa nhóm thành công.',
756+
'delete-failed' => 'Không thể xóa nhóm.',
757+
'delete-failed-associated-users' => 'Không thể xóa nhóm vì đang được sử dụng bởi người dùng.',
757758

758759
'datagrid' => [
759760
'delete' => 'Xóa',

0 commit comments

Comments
 (0)