diff --git a/module/webhook/control.php b/module/webhook/control.php index 3fcdbfb22a..ba01b36270 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -135,6 +135,19 @@ class webhook extends control */ public function log($id, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { + /* Save session. */ + $uri = $this->app->getURI(true); + $this->session->set('productList', $uri); + $this->session->set('productPlanList', $uri); + $this->session->set('releaseList', $uri); + $this->session->set('storyList', $uri); + $this->session->set('projectList', $uri); + $this->session->set('taskList', $uri); + $this->session->set('buildList', $uri); + $this->session->set('bugList', $uri); + $this->session->set('caseList', $uri); + $this->session->set('testtaskList', $uri); + $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/webhook/model.php b/module/webhook/model.php index e069f23ff4..36924c7878 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -87,10 +87,14 @@ class webhookModel extends model } $text = ''; - if(isset($data->markdown) and is_object($data->markdown)) + if(isset($data->markdown->text)) { $text = substr($data->markdown->text, 0, strpos($data->markdown->text, '(http')); } + elseif(isset($data->markdown->content)) + { + $text = substr($data->markdown->content, 0, strpos($data->markdown->content, '(http')); + } else { $text = substr($data->text, 0, strpos($data->text, '(http')) ? substr($data->text, 0, strpos($data->text, '(http')) : zget($users, $data->user, $this->app->user->realname) . $this->lang->action->label->{$action->action} . $this->lang->action->objectTypes[$action->objectType] . "[#{$action->objectID}::{$object->$field}]"; @@ -321,9 +325,9 @@ class webhookModel extends model $this->saveData($id, $actionID, $postData, $actor); continue; } - + $result = $this->fetchHook($webhook, $postData, $actionID); - $this->saveLog($webhook, $actionID, $postData, $result); + if(!empty($result)) $this->saveLog($webhook, $actionID, $postData, $result); } return !dao::isError(); } diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php index 735a625465..6747eb01bf 100644 --- a/module/webhook/view/browse.html.php +++ b/module/webhook/view/browse.html.php @@ -34,7 +34,8 @@