Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* add pptx in allowed file config and fix svn cat in action.

Browse Source
This commit is contained in:
wangyidong
2017-09-11 13:03:37 +08:00
parent b3369097a9
commit dd146a6bfc
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+17 -2
View File
@@ -222,12 +222,10 @@ class actionModel extends model
if($actionName == 'svncommited' and isset($commiters[$action->actor]))
{
$action->actor = $commiters[$action->actor];
if($this->config->requestType == 'GET') $action->comment = str_replace('+', '%2B', $action->comment);
}
elseif($actionName == 'gitcommited' and isset($commiters[$action->actor]))
{
$action->actor = $commiters[$action->actor];
if($this->config->requestType == 'GET') $action->comment = str_replace('+', '%2B', $action->comment);
}
elseif($actionName == 'linked2project')
{
@@ -324,6 +322,23 @@ class actionModel extends model
}
}
$action->history = isset($histories[$actionID]) ? $histories[$actionID] : array();
$actionName = strtolower($action->action);
if($actionName == 'svncommited')
{
foreach($action->history as $history)
{
if($history->field == 'subversion') $history->diff = str_replace('+', '%2B', $history->diff);
}
}
elseif($actionName == 'gitcommited')
{
foreach($action->history as $history)
{
if($history->field == 'git') $history->diff = str_replace('+', '%2B', $history->diff);
}
}
$action->comment = $this->file->setImgSize($action->comment, $this->config->action->commonImgSize);
$actions[$actionID] = $action;
}