瀏覽代碼

return translated error codes from dataproviders

andre 2 年之前
父節點
當前提交
335143f64c

+ 1 - 1
app/UI/Client/DistributionList/Providers/AddListDataProvider.php

@@ -168,7 +168,7 @@ class AddListDataProvider extends BaseDataProvider
         $result= $service->run();
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('distributionListHasBeenAdded')->setStatusSuccess();

+ 1 - 1
app/UI/Client/DistributionList/Providers/DeleteListDataProvider.php

@@ -63,7 +63,7 @@ class DeleteListDataProvider extends BaseDataProvider
          */
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('distributionListHasBeenDeleted')->setStatusSuccess();

+ 1 - 1
app/UI/Client/DistributionList/Providers/EditListDataProvider.php

@@ -221,7 +221,7 @@ class EditListDataProvider extends AddListDataProvider
 
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('distributionListHasBeenUpdated')->setStatusSuccess();

+ 1 - 1
app/UI/Client/DomainAlias/Providers/AddDomainAliasDataProvider.php

@@ -85,7 +85,7 @@ class AddDomainAliasDataProvider extends BaseDataProvider
          */
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('domainAliasHasBeenCreated')->setStatusSuccess();

+ 2 - 6
app/UI/Client/DomainAlias/Providers/DeleteDomainAliasProvider.php

@@ -74,14 +74,10 @@ class DeleteDomainAliasProvider extends BaseDataProvider
          */
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())
-                ->setMessage($service->getError())
-                ->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
-        return (new HtmlDataJsonResponse())
-            ->setMessageAndTranslate('domainAliasHasBeenDeleted')
-            ->setStatusSuccess();
+        return (new HtmlDataJsonResponse())->setMessageAndTranslate('domainAliasHasBeenDeleted')->setStatusSuccess();
     }
 
     public function massDelete()

+ 1 - 1
app/UI/Client/EmailAccount/Providers/DeleteAccountDataProvider.php

@@ -72,7 +72,7 @@ class DeleteAccountDataProvider extends BaseDataProvider
          */
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('emailAccountHasBeenDeleted')->setStatusSuccess();

+ 3 - 3
app/UI/Client/EmailAccount/Providers/EditAccountDataProvider.php

@@ -146,7 +146,7 @@ class EditAccountDataProvider extends BaseDataProvider
          */
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('emailAccountHasBeenUpdated')->setStatusSuccess();
@@ -192,7 +192,7 @@ class EditAccountDataProvider extends BaseDataProvider
 
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         /**
@@ -242,7 +242,7 @@ class EditAccountDataProvider extends BaseDataProvider
 
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('passwordChangedSuccessfully')->setStatusSuccess();

+ 1 - 1
app/UI/Client/EmailAlias/Providers/DeleteEmailAliasDataProvider.php

@@ -71,7 +71,7 @@ class DeleteEmailAliasDataProvider extends BaseDataProvider
          */
         if(!$result)
         {
-            return (new HtmlDataJsonResponse())->setMessage($service->getError())->setStatusError();
+            return (new HtmlDataJsonResponse())->setMessageAndTranslate($service->getError())->setStatusError();
         }
 
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('emailAliasHasBeenDeleted')->setStatusSuccess();