Merge pull request #30 from zfbase/feature-popup-exception

Feature popup exception
zfbase · May 15, 2020 · f49efa8 · f49efa8
2 parents 5ac41b7 + 73f8bfc
commit f49efa8
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 0 deletions.
diff --git a/library/ZFE/Controller/AbstractResource/Delete.php b/library/ZFE/Controller/AbstractResource/Delete.php
@@ -60,6 +60,8 @@ public function deleteAction($redirectUrl = null)
                 return true;
             }
         } catch (Throwable $ex) {
+            ZFE::popupException($ex);
+
             $this->error('Не удалось удалить ' . mb_strtolower($modelName::$nameSingular), $ex, false !== $redirectUrl);
 
             if (false !== $redirectUrl) {
@@ -115,6 +117,8 @@ public function undeleteAction($redirectUrl = null)
                 return true;
             }
         } catch (Throwable $ex) {
+            ZFE::popupException($ex);
+
             $this->error('Не удалось восстановить ' . mb_strtolower($modelName::$nameSingular), $ex, false !== $redirectUrl);
 
             if (false !== $redirectUrl) {

diff --git a/library/ZFE/Controller/AbstractResource/Edit.php b/library/ZFE/Controller/AbstractResource/Edit.php
@@ -103,6 +103,8 @@ public function editAction($redirectUrl = null, array $formOptions = [])
                         $this->abort(500, 'После сохранения в записи отсутствует ID.');
                     }
                 } catch (Throwable $ex) {
+                    ZFE::popupException($ex);
+
                     $this->error('Сохранить не удалось', $ex);
                 }
             }

diff --git a/library/ZFE/Controller/AbstractResource/History.php b/library/ZFE/Controller/AbstractResource/History.php
@@ -123,6 +123,8 @@ public function restoreAction($redirectUrl = null)
 
             $status = true;
         } catch (Throwable $ex) {
+            ZFE::popupException($ex);
+
             $this->error('Не удалось откатить ' . mb_strtolower($modelName::$nameSingular) . ' к версии ' . $version, $ex);
 
             $status = false;

diff --git a/library/ZFE/Controller/AbstractResource/Merge.php b/library/ZFE/Controller/AbstractResource/Merge.php
@@ -139,6 +139,8 @@ public function mergeHelperAction()
 
                 ZFE_Notices::ok($msg);
             } catch (Throwable $ex) {
+                ZFE::popupException($ex);
+
                 if ($this->_request->isXmlHttpRequest()) {
                     $this->_json(self::STATUS_FAIL, [], $ex->getMessage());
                 }

diff --git a/library/ZFE/Controller/Default/History.php b/library/ZFE/Controller/Default/History.php
@@ -80,6 +80,8 @@ public function diffAction()
                 throw new ZFE_Controller_Exception();
             }
         } catch (Throwable $ex) {
+            ZFE::popupException($ex);
+
             $this->abort(500, 'Не корректный класс записи');
         }
 

diff --git a/library/ZFE/Tasks/Manager.php b/library/ZFE/Tasks/Manager.php
@@ -237,6 +237,7 @@ final public function manage($tasks, Zend_Log $logger = null): int
             try {
                 $performer = $this->assign($task);
             } catch (ZFE_Tasks_Exception $e) {
+                ZFE::popupException($e);
                 $this->logHelper($logger, $e->getMessage(), Zend_Log::ERR);
                 continue;
             }
@@ -249,6 +250,8 @@ final public function manage($tasks, Zend_Log $logger = null): int
                 $this->logHelper($logger, "Task #{$task->id} performed successfully");
                 $managed++;
             } catch (ZFE_Tasks_Performer_Exception $e) {
+                ZFE::popupException($e);
+
                 $task->errors = $e->getMessage();
                 $task->save();
 

diff --git a/library/ZFE/Utilities.php b/library/ZFE/Utilities.php
@@ -258,4 +258,15 @@ public static function makeAbbr(string $text)
 
         return $text;
     }
+
+    /**
+     * Пропустить перехват исключения (если в конфигурации разрешено).
+     */
+    public static function popupException(Exception $ex)
+    {
+        $config = Zend_Registry::get('config');
+        if ($config->debug->popupExceptions ?? false) {
+            throw $ex;
+        }
+    }
 }