* [task#126383,doing,1h] Revert code.
This commit is contained in:
@@ -167,7 +167,7 @@ class projectModel extends model
|
||||
public function getByID(int $projectID, string $type = ''): object|false
|
||||
{
|
||||
/* Using demo data during tutorials. */
|
||||
if(commonModel::isTutorialMode()) return $this->loadModel('tutorial')->getProject($projectID);
|
||||
if(commonModel::isTutorialMode()) return $this->loadModel('tutorial')->getProject();
|
||||
|
||||
/* Get project info. */
|
||||
$project = $this->projectTao->fetchProjectInfo($projectID, $type);
|
||||
@@ -1075,8 +1075,6 @@ class projectModel extends model
|
||||
*/
|
||||
public function create(object $project, object $postData): int|bool
|
||||
{
|
||||
if(common::isTutorialMode()) return $this->loadModel('tutorial')->createProject($project);
|
||||
|
||||
$project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->create['id'], $this->post->uid);
|
||||
|
||||
$this->projectTao->doCreate($project);
|
||||
@@ -2133,7 +2131,7 @@ class projectModel extends model
|
||||
if(!$this->loadModel('common')->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false);
|
||||
|
||||
$projectID = (int)$this->checkAccess($projectID, $this->getPairsByProgram());
|
||||
$project = commonModel::isTutorialMode() ? $this->loadModel('tutorial')->getProject($projectID) : $this->projectTao->fetchProjectInfo($projectID);
|
||||
$project = commonModel::isTutorialMode() ? $this->loadModel('tutorial')->getProject() : $this->projectTao->fetchProjectInfo($projectID);
|
||||
if(!$project) return false;
|
||||
|
||||
/* Reset project priv. */
|
||||
|
||||
@@ -56,7 +56,7 @@ $scrumProjectManage->tasks['manageProject']['steps'][] = array(
|
||||
|
||||
$scrumProjectManage->tasks['manageProject']['steps'][] = array(
|
||||
'type' => 'click',
|
||||
'target' => '#table-project-browse .dtable-body div[data-row="3"] a',
|
||||
'target' => '#table-project-browse .dtable-body div[data-row="2"] a',
|
||||
'page' => 'project-browse',
|
||||
'title' => $lang->tutorial->scrumProjectManage->manageProject->step6->name,
|
||||
'desc' => $lang->tutorial->scrumProjectManage->manageProject->step6->desc
|
||||
|
||||
@@ -12,21 +12,6 @@ declare(strict_types=1);
|
||||
*/
|
||||
class tutorialModel extends model
|
||||
{
|
||||
/**
|
||||
* 获取当前所在的教程和任务。
|
||||
* Get guide and task.
|
||||
*
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
public function getGuideTaskName()
|
||||
{
|
||||
if(empty($_SERVER['HTTP_X_ZIN_TUTORIAL'])) return array('guide' => '', 'guideTask' => '', 'stepIndex' => 0);
|
||||
|
||||
list($guide, $guideTask, $guideStepIndex) = explode('-', $_SERVER['HTTP_X_ZIN_TUTORIAL']);
|
||||
return array('guide' => $guide, 'guideTask' => $guideTask, 'stepIndex' => $guideStepIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查新手模式配置。
|
||||
* Check novice mode config.
|
||||
@@ -141,33 +126,17 @@ class tutorialModel extends model
|
||||
return $productStat;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建新手模式项目。
|
||||
* Create project for tutorial;
|
||||
*
|
||||
* @param object $postData
|
||||
* @access public
|
||||
* @return object
|
||||
*/
|
||||
public function createProject(object $project): int
|
||||
{
|
||||
$guideInfo = $this->getGuideTaskName();
|
||||
$this->session->set($guideInfo['guide'] . '_' . $guideInfo['guideTask'] . '_project', $project);
|
||||
return 3;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取新手模式项目。
|
||||
* Get project for tutorial;
|
||||
*
|
||||
* @param int $projectID 内置项目ID是2,用户自己创建项目ID是3
|
||||
* @access public
|
||||
* @return object
|
||||
*/
|
||||
public function getProject(int $projectID = 2): object
|
||||
public function getProject(): object
|
||||
{
|
||||
$project = new stdclass();
|
||||
$project->id = $projectID;
|
||||
$project->id = 2;
|
||||
$project->project = 0;
|
||||
$project->model = 'scrum';
|
||||
$project->type = 'project';
|
||||
@@ -185,7 +154,7 @@ class tutorialModel extends model
|
||||
$project->goal = '';
|
||||
$project->acl = 'open';
|
||||
$project->parent = 0;
|
||||
$project->path = ",$projectID,";
|
||||
$project->path = ",2,";
|
||||
$project->grade = 1;
|
||||
$project->PM = $this->app->user->account;
|
||||
$project->PO = $this->app->user->account;
|
||||
@@ -205,22 +174,6 @@ class tutorialModel extends model
|
||||
$project->estimate = 0;
|
||||
$project->left = 0;
|
||||
|
||||
if($projectID == 3)
|
||||
{
|
||||
$guideInfo = $this->getGuideTaskName();
|
||||
$sessionName = $guideInfo['guide'] . '_' . $guideInfo['guideTask'] . '_project';
|
||||
if(!empty($_SESSION[$sessionName]))
|
||||
{
|
||||
$project->id = 3;
|
||||
|
||||
$userProject = $this->session->{$sessionName};
|
||||
foreach($userProject as $key => $value)
|
||||
{
|
||||
if(!empty($value)) $project->$key = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $project;
|
||||
}
|
||||
|
||||
@@ -259,15 +212,6 @@ class tutorialModel extends model
|
||||
if($browseType && $browseType != 'all') $project->name .= '-' . $browseType; // Fix bug #21096
|
||||
|
||||
$projectStat[$project->id] = $project;
|
||||
|
||||
$guideInfo = $this->getGuideTaskName();
|
||||
$sessionName = $guideInfo['guide'] . '_' . $guideInfo['guideTask'] . '_project';
|
||||
if(!empty($_SESSION[$sessionName]) && $guideInfo['stepIndex'] == 4)
|
||||
{
|
||||
$newProject = $this->getProject(3);
|
||||
$projectStat[$newProject->id] = $newProject;
|
||||
}
|
||||
|
||||
return $projectStat;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user