diff --git a/module/admin/model.php b/module/admin/model.php
index 2f0294656f..e097e06407 100644
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -239,6 +239,7 @@ class adminModel extends model
/* Check weak password when login. */
if($this->app->moduleName == 'user' and $this->app->methodName == 'login')
{
+ if(!isset($_POST['passwordStrength']) return true;
if(isset($this->config->safe->mode) and $this->post->passwordStrength < $this->config->safe->mode) return true;
}
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 6ab4bda422..bdc45eec1f 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -25,8 +25,8 @@
- $branches):?>
-
+ $mapBranches):?>
+
begin)):?>
- begin) echo "class='active'";?>>
diff --git a/module/project/control.php b/module/project/control.php
index 0414baf211..8b3c066452 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1118,6 +1118,7 @@ class project extends control
}
}
+ $this->view->isSprint = false;
if(strpos($this->config->custom->productProject, '_2'))
{
$this->view->isSprint = true;
@@ -1219,6 +1220,7 @@ class project extends control
$productPlans[$product->id] = $this->productplan->getPairs($product->id);
}
+ $this->view->isSprint = false;
if(strpos($this->config->custom->productProject, '_2'))
{
$this->view->isSprint = true;
diff --git a/module/project/model.php b/module/project/model.php
index c9c9a91d00..309e490541 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1779,13 +1779,20 @@ class projectModel extends model
$this->dao->insert(TABLE_TEAM)->data($member)->exec();
}
- $this->loadModel('user')->updateUserView($projectID, 'project', $accounts);
+
+ /* Only changed account update userview. */
+ $oldAccounts = array_keys($oldJoin);
+ $changedAccounts = array_diff($accounts, $oldAccounts);
+ $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
+ $changedAccounts = array_unique($changedAccounts);
+
+ $this->loadModel('user')->updateUserView($projectID, 'project', $changedAccounts);
$products = $this->getProducts($projectID, false);
foreach($products as $productID => $productName)
{
if(empty($productID)) continue;
- $this->user->updateUserView($productID, 'product', $accounts);
+ $this->user->updateUserView($productID, 'product', $changedAccounts);
}
}