id", '', 'button', 'columns', '', '', '', '', $lang->project->kanban);
common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc", '', 'button', '', '', 'export');
$this->lang->story->create = $this->lang->project->createStory;
diff --git a/module/project/view/storykanban.html.php b/module/project/view/storykanban.html.php
new file mode 100644
index 0000000000..21fe7bb2f1
--- /dev/null
+++ b/module/project/view/storykanban.html.php
@@ -0,0 +1,101 @@
+
+
+project->confirmUnlinkStory)?>
+
+
icons['story']);?> project->story;?>
+
+
+ id", '', 'button', 'list', '', '', '', '', $lang->project->story);
+ common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc", '', 'button', '', '', 'export');
+
+ $this->lang->story->create = $this->lang->project->createStory;
+ if($productID and !$this->loadModel('story')->checkForceReview()) common::printIcon('story', 'create', "productID=$productID&branch=&moduleID=0&story=0&project=$project->id");
+
+ if(commonModel::isTutorialMode())
+ {
+ $wizardParams = helper::safe64Encode("project=$project->id");
+ echo html::a($this->createLink('tutorial', 'wizard', "module=project&method=linkStory¶ms=$wizardParams"), " {$lang->project->linkStory}",'', "class='btn link-story-btn'");
+ }
+ else
+ {
+ common::printIcon('project', 'linkStory', "project=$project->id", '', 'button', 'link', '', 'link-story-btn');
+ }
+ ?>
+
+
+
+
+app->user->account
+?>
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+ createLink('story', 'view', "story=$story->id", '', true), $story->title, '', 'class="kanbanFrame" title="' . $story->title . '"');?>
+
+
+
+ |
+
+
+
+
+
+
+
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 388c7a333e..aa3a862486 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -126,7 +126,8 @@
{
if($product->type !== 'normal')
{
- echo html::a($this->createLink('product', 'browse', "productID=$productID&branch=$product->branch"), $product->name . '/' . $branchGroups[$productID][$product->branch]);
+ $branchName = isset($branchGroups[$productID][$product->branch]) ? '/' . $branchGroups[$productID][$product->branch] : ''
+ echo html::a($this->createLink('product', 'browse', "productID=$productID&branch=$product->branch"), $product->name . $branchName);
}
else
{
diff --git a/module/story/model.php b/module/story/model.php
index 017dde597f..da7345bef5 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2174,6 +2174,21 @@ class storyModel extends model
->groupBy('version')->orderBy('value')->fetchAll();
}
+ /**
+ * Get kanban group data.
+ *
+ * @param array $stories
+ * @access public
+ * @return array
+ */
+ public function getKanbanGroupData($stories)
+ {
+ $storyGroup = array();
+ foreach($stories as $story) $storyGroup[$story->stage][$story->id] = $story;
+
+ return $storyGroup;
+ }
+
/**
* Adjust the action clickable.
*
diff --git a/module/webhook/config.php b/module/webhook/config.php
index f261ff89bb..7f69b69cd9 100644
--- a/module/webhook/config.php
+++ b/module/webhook/config.php
@@ -13,7 +13,7 @@ $config->webhook->objectTypes['story'] = array('opened', 'edited', 'commen
$config->webhook->objectTypes['productplan'] = array('opened', 'edited');
//$config->webhook->objectTypes['release'] = array('opened', 'edited', 'changestatus');
$config->webhook->objectTypes['project'] = array('opened', 'edited', 'started', 'delayed', 'suspended', 'closed', 'activated', 'undeleted');
-$config->webhook->objectTypes['task'] = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'editestimate', 'paused', 'canceled', 'restarted', 'closed', 'activated');
+$config->webhook->objectTypes['task'] = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'paused', 'canceled', 'restarted', 'closed', 'activated');
//$config->webhook->objectTypes['build'] = array('opened', 'edited');
$config->webhook->objectTypes['bug'] = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'bugconfirmed', 'resolved', 'closed', 'activated');
$config->webhook->objectTypes['case'] = array('opened', 'edited', 'commented', 'reviewed', 'confirmed');
diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php
index 1ebd344a02..be16f050e3 100644
--- a/module/webhook/lang/zh-cn.php
+++ b/module/webhook/lang/zh-cn.php
@@ -5,7 +5,7 @@ $lang->webhook->api = '接口';
$lang->webhook->entry = '应用';
$lang->webhook->dingding = '钉钉';
$lang->webhook->log = '日志';
-$lang->webhook->assigend = '指派给';
+$lang->webhook->assigned = '指派给';
$lang->webhook->browse = '浏览钩子';
$lang->webhook->create = '添加钩子';
diff --git a/module/webhook/model.php b/module/webhook/model.php
index 0fb152b733..211dd1b870 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -69,7 +69,7 @@ class webhookModel extends model
$this->loadModel('action');
$actions = $this->dao->select('*')->from(TABLE_ACTION)->where('id')->in($actions)->fetchAll('id');
-
+ $users = $this->loadModel('user')->getPairs('noletter');
foreach($logs as $log)
{
if(!isset($actions[$log->action]))
@@ -100,7 +100,7 @@ class webhookModel extends model
*/
public function getDataList()
{
- return $this->dao->select('*')->from(TABLE_WEBHOOKDATA)->where('status')->eq('wait')->orderBy('id')->fetchAll('id');
+ return $this->dao->select('*')->from(TABLE_WEBHOOKDATAS)->where('status')->eq('wait')->orderBy('id')->fetchAll('id');
}
/**
@@ -317,6 +317,7 @@ class webhookModel extends model
$oldOnlyBody = 'yes';
unset($_GET['onlybody']);
}
+ if($objectType == 'case') $objectType = 'testcase';
$viewLink = helper::createLink($objectType, 'view', "id=$objectID");
if($oldOnlyBody) $_GET['onlybody'] = $oldOnlyBody;
@@ -401,7 +402,7 @@ class webhookModel extends model
$webhookData->createdBy = $this->app->user->account;
$webhookData->createdDate = helper::now();
- $this->dao->insert(TABLE_WEBHOOKDATA)->data($webhookData)->exec();
+ $this->dao->insert(TABLE_WEBHOOKDATAS)->data($webhookData)->exec();
return !dao::isError();
}