diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index bde1c19b3d..4c1e7b54e7 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -622,7 +622,7 @@ $lang->action->label->issue = 'Issue|issue|view|issueID=%s';
$lang->action->label->design = 'Design|design|view|designID=%s';
$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s';
-$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=all';
+$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s';
$lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s';
$lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s';
$lang->action->label->kanbancolumn = 'Kanban Column|execution|kanban|execution=%s';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 98679d3045..4442e8c448 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -622,7 +622,7 @@ $lang->action->label->issue = '问题|issue|view|issueID=%s';
$lang->action->label->design = '设计|design|view|designID=%s';
$lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s';
$lang->action->label->api = '接口|api|index|libID=%s&moduleID=%s&apiID=%s';
-$lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=all';
+$lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=%s';
$lang->action->label->kanbanregion = '看板区域|kanban|view|kanbanID=%s';
$lang->action->label->kanban = '看板|kanban|view|kanbanID=%s';
$lang->action->label->kanbancolumn = '看板列|execution|kanban|execution=%s';
diff --git a/module/action/model.php b/module/action/model.php
index 5aaabd6619..594e839a21 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1289,6 +1289,11 @@ class actionModel extends model
{
$params = sprintf($vars, trim($action->product, ','));
}
+ elseif($action->objectType == 'kanbanspace')
+ {
+ $kanbanSpace = $this->dao->select('type')->from(TABLE_KANBANSPACE)->where('id')->eq($action->objectID)->fetch();
+ $params = sprintf($vars, $kanbanSpace->type);
+ }
elseif($action->objectType == 'kanbancolumn' or $action->objectType == 'kanbanlane')
{
$params = sprintf($vars, $action->extra);
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 04de5ea5f5..2ad001cfd7 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -168,7 +168,7 @@ class kanban extends control
unset($this->lang->kanbanspace->featureBar['involved']);
$space = $this->kanban->getSpaceById($spaceID);
- $spaceUsers = trim($space->owner) . ',' . trim($space->team) . ',' . trim($space->whitelist);
+ $spaceUsers = $spaceID == 0 ? ',' : trim($space->owner) . ',' . trim($space->team) . ',' . trim($space->whitelist);
$users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $spaceUsers);
$this->view->users = $users;
diff --git a/module/kanban/js/create.js b/module/kanban/js/create.js
index 97ea9a50ec..d9b1116fbc 100644
--- a/module/kanban/js/create.js
+++ b/module/kanban/js/create.js
@@ -1,13 +1,14 @@
/**
- * When type change.
+ * When space type or space value change.
*
* @oaram int spaceID
* @param string type
* @access public
* @return void
*/
-function changeType(spaceID, type)
+function changeValue(spaceID, type = '')
{
+ if(type == '') type = spaceType;
location.href = createLink('kanban', 'create', 'spaceID=' + spaceID + '&type=' + type);
}
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 5a45356b04..37b386a1e2 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1448,7 +1448,6 @@ class kanbanModel extends model
->setDefault('createdBy', $account)
->setDefault('createdDate', helper::now())
->setdefault('team', '')
- ->setdefault('owner', $account)
->setdefault('whitelist', '')
->join('whitelist', ',')
->join('team', ',')
@@ -1456,6 +1455,8 @@ class kanbanModel extends model
->remove('uid,contactListMenu')
->get();
+ if($space->type == 'private') $space->owner = $account;
+
if(strpos(",{$space->team},", ",$account,") === false and $space->owner != $account) $space->team .= ",$account";
$space = $this->loadModel('file')->processImgURL($space, $this->config->kanban->editor->createspace['id'], $this->post->uid);
diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php
index ee0b35ad5f..801a74ab6a 100644
--- a/module/kanban/view/create.html.php
+++ b/module/kanban/view/create.html.php
@@ -12,6 +12,7 @@
?>
+
kanban->create;?>
@@ -20,12 +21,12 @@