|
dao->replace(TABLE_USERGROUP)->data($groupPriv)->exec();
}
+ if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
+
return $projectID;
}
}
diff --git a/module/repo/model.php b/module/repo/model.php
index 03ec69715a..acb8566700 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1769,20 +1769,27 @@ class repoModel extends model
return $buildedURL;
}
- /**
- * Get gitlab projects.
- *
- * @param string $host
- * @param string $token
- * @access public
- * @return array
- */
- public function getGitlabProjects($host, $token)
- {
+ /**
+ * Get gitlab projects.
+ *
+ * @param string $host
+ * @param string $token
+ * @access public
+ * @return array
+ */
+ public function getGitlabProjects($host, $token)
+ {
$host = rtrim($host, '/');
$host .= '/api/v4/projects';
- $projects = file_get_contents($host . "?private_token=$token");
- return json_decode($projects);
- }
+ $allResults = array();
+ for($page = 1; true; $page ++)
+ {
+ $results = json_decode(file_get_contents($host . "?private_token=$token&page={$page}&per_page=100"));
+ if(empty($results)) break;
+ $allResults = $allResults + $results;
+ }
+
+ return $allResults;
+ }
}
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 403469e06c..f51da2b2be 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -134,7 +134,7 @@ class upgrade extends control
if(!$this->upgrade->isError())
{
- if(!$this->config->systemMode && !isset($this->config->qcVersion)) $this->locate(inlink('to15Guide', "fromVersion=$fromVersion"));
+ if(!$this->config->systemMode && !isset($this->config->qcVersion) && strpos($fromVersion, 'max') === false) $this->locate(inlink('to15Guide', "fromVersion=$fromVersion"));
$this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
}
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index cefc175566..5c8a6dbf4f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4199,6 +4199,7 @@ class upgradeModel extends model
$program->openedDate = helper::now();
$program->openedVersion = $this->config->version;
$program->acl = 'open';
+ $program->days = $this->computeDaysDelta($program->begin, $program->end);
$this->app->loadLang('program');
$this->app->loadLang('project');
@@ -4274,6 +4275,7 @@ class upgradeModel extends model
$project->status = $data->projectStatus;
$project->begin = $data->begin;
$project->end = isset($data->end) ? $data->end : LONG_TIME;
+ $project->days = $this->computeDaysDelta($project->begin, $project->end);
$project->PM = $data->PM;
$project->auth = 'extend';
$project->openedBy = $account;
@@ -4324,6 +4326,32 @@ class upgradeModel extends model
return array($programID, $projectID, $lineID);
}
+ /**
+ * Compute delta of two days.
+ *
+ * @param string begin
+ * @param string end
+ * @access public
+ * @return int
+ */
+ public function computeDaysDelta($begin, $end)
+ {
+ if($end == LONG_TIME) return 0;
+
+ $delta = helper::diffDate($end, $begin);
+ $week = date('w', strtotime($begin));
+ $weekend = 0;
+ for($i = 0; $i < $delta; $i++)
+ {
+ $week = $week % 7;
+ if($week == 0 or $week == 6) $weekend ++;
+
+ $week++;
+ }
+
+ return $delta - $weekend;
+ }
+
/**
* Replace program or project id for product and project linked objects.
*
@@ -4397,8 +4425,11 @@ class upgradeModel extends model
$this->dao->replace(TABLE_PROJECTCASE)->data($projectCase)->exec();
}
- /* Compute sprint path and grade. */
- $sprints = $this->dao->select('id, type, acl')->from(TABLE_PROJECT)->where('id')->in($sprintIdList)->fetchAll();
+ /* Compute sprint path, grade and the minimum start date and end date of the project. */
+ $project = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
+ $sprints = $this->dao->select('id, type, acl, begin, end')->from(TABLE_PROJECT)->where('id')->in($sprintIdList)->fetchAll();
+ $minBeginDate = $project->begin;
+ $maxEndData = $project->end;
foreach($sprints as $sprint)
{
$data = new stdclass();
@@ -4411,6 +4442,9 @@ class upgradeModel extends model
$data->lifetime = empty($sprint->lifetime) ? $sprint->type : $sprint->lifetime;
$this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($sprint->id)->exec();
+
+ $minBeginDate = ($sprint->begin < $minBeginDate) ? $sprint->begin : $minBeginDate;
+ $maxEndData = $sprint->end > $maxEndData ? $sprint->end : $maxEndData;
}
/* Compute project date and status. */
@@ -4429,6 +4463,13 @@ class upgradeModel extends model
$data->closedDate = $maxRealEnd;
}
+ if($minBeginDate != $project->begin or $maxEndData != $project->end)
+ {
+ $data->begin = $minBeginDate;
+ $data->end = $maxEndData;
+ $data->days = $this->computeDaysDelta($data->begin, $data->end);
+ }
+
$this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($projectID)->exec();
/* Set product and project relation. */
@@ -4481,8 +4522,10 @@ class upgradeModel extends model
$users = $this->dao->select('account')->from(TABLE_USER)->where('deleted')->eq('0')->fetchPairs('account', 'account');
/* Insert product and sprint team into project team. */
- $today = helper::today();
- foreach($teams as $account)
+ $today = helper::today();
+ $project = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
+ $projectMember = $this->dao->select('*')->from(TABLE_TEAM)->where('account')->in($teams)->fetchAll('account');
+ foreach($projectMember as $account => $user)
{
if(empty($account)) continue;
if(!isset($users[$account])) continue;
@@ -4491,7 +4534,10 @@ class upgradeModel extends model
$team->root = $projectID;
$team->type = 'project';
$team->account = $account;
+ $team->role = $user->role;
$team->join = $today;
+ $team->days = $project->days;
+ $team->hours = '7.0';
$this->dao->replace(TABLE_TEAM)->data($team)->exec();
}
diff --git a/module/user/model.php b/module/user/model.php
index 3b68f42bee..b21d70430b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -192,6 +192,7 @@ class userModel extends model
* Get user info by ID.
*
* @param mix $userID
+ * @param string $field id|account
* @access public
* @return object|bool
*/
diff --git a/test/init.php b/test/init.php
index 93c3aa8626..5b362be7c9 100644
--- a/test/init.php
+++ b/test/init.php
@@ -46,8 +46,8 @@ function run($result)
/**
* Print expect data.
*
- * @param int $key
- * @param string $delimiter
+ * @param string $key
+ * @param string $delimiter
* @access public
* @return void
*/
@@ -96,6 +96,6 @@ function zdImport($table, $yaml, $count = 10)
global $app, $config;
$dns = "mysql://{$config->db->user}:{$config->db->password}@{$config->db->host}:{$config->db->port}/{$config->db->name}#utf8";
$table = trim($table, '`');
- $commad = "$config->zdPath -c $yaml -t $table -T -dns $dns --clear -n $count";
- system($commad);
+ $command = "$config->zdPath -c $yaml -t $table -T -dns $dns --clear -n $count";
+ system($command);
}
|