@@ -106,12 +114,18 @@ $(function()
| testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?> |
precondition) ? htmlSpecialString($case->precondition) : "", "class='form-control'")?> |
keywords) ? $case->keywords : '', "class='form-control'")?> |
-
- loadModel('flow');?>
-
- flow->buildControl($appendField, zget($case, $appendField->field, ''), "{$appendField->field}[$key]");?> |
-
-
+ loadModel('flow');
+ foreach($appendFields as $field)
+ {
+ if(!$field->show) continue;
+ $value = $field->defaultValue ? $field->defaultValue : zget($case, $field->field, '');
+ echo '' . $this->flow->buildControl($field, $value, "$field->field[$key]", true) . ' | ';
+ }
+ }
+ ?>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index af7c0c6b1c..b5930503f2 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -772,8 +772,10 @@ class testtaskModel extends model
$testtask = fixer::input('post')
->add('id', $taskID)
->setDefault('status', 'doing')
+ ->stripTags($this->config->testtask->editor->start['id'], $this->config->allowedTags)
->remove('comment')->get();
+ $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->start['id'], $this->post->uid);
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
@@ -838,8 +840,10 @@ class testtaskModel extends model
$testtask = fixer::input('post')
->add('id', $taskID)
->setDefault('status', 'blocked')
+ ->stripTags($this->config->testtask->editor->block['id'], $this->config->allowedTags)
->remove('comment')->get();
+ $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->block['id'], $this->post->uid);
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
@@ -861,8 +865,10 @@ class testtaskModel extends model
$oldTesttask = $this->getById($taskID);
$testtask = fixer::input('post')
->setDefault('status', 'doing')
+ ->stripTags($this->config->testtask->editor->activate['id'], $this->config->allowedTags)
->remove('comment')->get();
+ $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->activate['id'], $this->post->uid);
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
diff --git a/module/tree/control.php b/module/tree/control.php
index 3c34f12db0..d813cbddd0 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -229,6 +229,40 @@ class tree extends control
$title = $this->lang->tree->manageTrainpost;
$position[] = $this->lang->tree->manageTrainpost;
}
+ elseif(strpos($viewType, 'datasource') !== false)
+ {
+ $params = explode('_', $viewType);
+ if(count($params) == 2)
+ {
+ $datasourceID = $params[1];
+ $manageChild = 'manage' . ucfirst($viewType) . 'Child';
+ $datasource = $this->loadModel('workflowdatasource', 'flow')->getByID($datasourceID);
+ if($datasource)
+ {
+ $title = $datasource->name;
+ $position[] = $datasource->name;
+
+ $this->lang->tree->$manageChild = $title;
+
+ $root = new stdclass();
+ $root->name = $title;
+ $this->view->root = $root;
+ }
+ }
+ }
+ else
+ {
+ $manageChild = 'manage' . ucfirst($viewType) . 'Child';
+
+ $title = $this->lang->tree->common;
+ $position[] = $this->lang->tree->common;
+
+ $this->lang->tree->$manageChild = $title;
+
+ $root = new stdclass();
+ $root->name = $title;
+ $this->view->root = $root;
+ }
$parentModules = $this->tree->getParents($currentModuleID);
$this->view->title = $title;
diff --git a/module/user/control.php b/module/user/control.php
index ad3c48a31e..da51d999e6 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -1187,19 +1187,21 @@ class user extends control
* @param int $contactListID
* @param string $dropdownName mailto|whitelist
* @param string $oldUsers
+ * @param string $extra
* @access public
* @return string
*/
- public function ajaxGetContactUsers($contactListID, $dropdownName = 'mailto', $oldUsers = '')
+ public function ajaxGetContactUsers($contactListID, $dropdownName = 'mailto', $oldUsers = '', $extra = '')
{
$list = $contactListID ? $this->user->getContactListByID($contactListID) : '';
-
$attr = $dropdownName == 'mailto' ? "data-placeholder='{$this->lang->chooseUsersToMail}'" : '';
$users = $this->user->getPairs('devfirst|nodeleted|noclosed', $list ? $list->userList : '', $this->config->maxCount);
+ if(!empty($extra) && $extra == 'flow') $users = array_merge(array('deptManager' => $this->lang->workflowdatasource->options['deptManager']), $users);
if(isset($this->config->user->moreLink)) $this->config->moreLinks[$dropdownName . "[]"] = $this->config->user->moreLink;
$defaultUsers = empty($contactListID) ? '' : $list->userList . ',' . trim($oldUsers);
+ if($extra == 'flow' && empty($defaultUsers)) $defaultUsers = trim($oldUsers);
return print(html::select($dropdownName . "[]", $users, $defaultUsers, "class='form-control chosen' multiple $attr"));
}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 42c66c6689..0263440d76 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -91,3 +91,4 @@ a.showMoreImage:hover {opacity: 1;}
#headerActions .dropdown-menu:before, #headerActions .dropdown-menu:hover:before {position: absolute; top: -9px; right: 50%; width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}
.icon-size-width:before {content: "\e9c5"; transform: rotate(90deg); -ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -webkit-transform: rotate(90deg); -o-transform: rotate(90deg);}
+.checkbox-primary > label{overflow: hidden;}
|