From 5f35a398ad246b34dea0b97aea4e1170669c5355 Mon Sep 17 00:00:00 2001 From: zenggang Date: Mon, 11 Oct 2021 07:26:18 +0000 Subject: [PATCH 1/3] * Finish task#43179 --- module/common/model.php | 13 +++++++++++-- module/project/view/createguide.html.php | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 77fe324f46..18e8eb3f37 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -400,17 +400,26 @@ class commonModel extends model $params = "objectType=&objectID=0&libID=0"; $createMethod = 'selectLibType'; } + if($objectType == 'project') + { + if(isset($config->maxVersion) and !defined('TUTORIAL')) + { + $params = "programID=0©ProjectID=0&extra=from=global"; + $createMethod = 'createGuide'; + $attr = 'data-toggle="modal" data-target="#guideDialog"'; + } + else $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; + } if($objectType == 'bug') $params = "productID=$productID&branch=&extras=from=global"; if($objectType == 'story') $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global"; if($objectType == 'task') $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global"; if($objectType == 'testcase') $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; if($objectType == 'execution') $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; - if($objectType == 'project') $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; if($objectType == 'product') $params = "programID=&extra=from=global"; if($objectType == 'program') $params = "parentProgramID=0&extra=from=global"; - $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), " " . $lang->createObjects[$objectType], '', $isOnlyBody ? $attr : '') . '
    • '; + $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), " " . $lang->createObjects[$objectType], '', $attr) . '
    • '; } } diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php index 3e650f3911..117047aa91 100644 --- a/module/project/view/createguide.html.php +++ b/module/project/view/createguide.html.php @@ -17,14 +17,14 @@
    - createLink("project", "create", "model=scrum&projectID=$projectID"), "", '', "data-app='{$app->tab}'")?> + createLink("project", "create", "model=scrum&projectID=$projectID"), "", '', "data-app='project'")?>

    project->scrum; ?>

    project->scrumTitle; ?>

    - createLink("project", "create", "model=waterfall&projectID=$projectID"), "", '', "data-app='{$app->tab}'")?> + createLink("project", "create", "model=waterfall&projectID=$projectID"), "", '', "data-app='project'")?>

    project->waterfall; ?>

    project->waterfallTitle; ?>

    From 8f0b4a575eb7aaa34f7075348b67dc62e8182dd4 Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 13 Oct 2021 01:44:56 +0000 Subject: [PATCH 2/3] * Adjust code style --- module/common/model.php | 66 +++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 18e8eb3f37..bd2e2964e3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -391,33 +391,53 @@ class commonModel extends model } $showCreateList = true; - $isOnlyBody = $objectType == 'doc'; - $attr = $objectType == 'doc' ? "class='iframe' data-width='650px'" : ''; + $isOnlyBody = false; + $attr = ''; $params = ''; - if($objectType == 'doc') - { - $params = "objectType=&objectID=0&libID=0"; - $createMethod = 'selectLibType'; - } - if($objectType == 'project') - { - if(isset($config->maxVersion) and !defined('TUTORIAL')) + switch($objectType) { - $params = "programID=0©ProjectID=0&extra=from=global"; - $createMethod = 'createGuide'; - $attr = 'data-toggle="modal" data-target="#guideDialog"'; - } - else $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; - } + case 'doc': + $params = "objectType=&objectID=0&libID=0"; + $createMethod = 'selectLibType'; + $isOnlyBody = true; + $attr = "class='iframe' data-width='650px'"; + break; + case 'project': + if(isset($config->maxVersion) and!defined('TUTORIAL')) + { + $params = "programID=0©ProjectID=0&extra=from=global"; + $createMethod = 'createGuide'; + $attr = 'data-toggle="modal" data-target="#guideDialog"'; + } + else + { + $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; + } - if($objectType == 'bug') $params = "productID=$productID&branch=&extras=from=global"; - if($objectType == 'story') $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global"; - if($objectType == 'task') $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global"; - if($objectType == 'testcase') $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; - if($objectType == 'execution') $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; - if($objectType == 'product') $params = "programID=&extra=from=global"; - if($objectType == 'program') $params = "parentProgramID=0&extra=from=global"; + break; + case 'bug': + $params = "productID=$productID&branch=&extras=from=global"; + break; + case 'story': + $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global"; + break; + case 'task': + $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global"; + break; + case 'testcase': + $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; + break; + case 'execution': + $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; + break; + case 'product': + $params = "programID=&extra=from=global"; + break; + case 'program': + $params = "parentProgramID=0&extra=from=global"; + break; + } $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), " " . $lang->createObjects[$objectType], '', $attr) . '
    • '; } From de37a33ed5cced0260d32e0352ad1f90b6efc89e Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 14 Oct 2021 01:56:19 +0000 Subject: [PATCH 3/3] * Adjust code format --- module/common/model.php | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index bd2e2964e3..741334adb8 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -396,48 +396,48 @@ class commonModel extends model $params = ''; switch($objectType) - { - case 'doc': - $params = "objectType=&objectID=0&libID=0"; - $createMethod = 'selectLibType'; - $isOnlyBody = true; - $attr = "class='iframe' data-width='650px'"; - break; - case 'project': - if(isset($config->maxVersion) and!defined('TUTORIAL')) - { - $params = "programID=0©ProjectID=0&extra=from=global"; - $createMethod = 'createGuide'; - $attr = 'data-toggle="modal" data-target="#guideDialog"'; - } - else - { - $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; - } + { + case 'doc': + $params = "objectType=&objectID=0&libID=0"; + $createMethod = 'selectLibType'; + $isOnlyBody = true; + $attr = "class='iframe' data-width='650px'"; + break; + case 'project': + if(isset($config->maxVersion) and!defined('TUTORIAL')) + { + $params = "programID=0©ProjectID=0&extra=from=global"; + $createMethod = 'createGuide'; + $attr = 'data-toggle="modal" data-target="#guideDialog"'; + } + else + { + $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; + } - break; - case 'bug': - $params = "productID=$productID&branch=&extras=from=global"; - break; - case 'story': - $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global"; - break; - case 'task': - $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global"; - break; - case 'testcase': - $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; - break; - case 'execution': - $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; - break; - case 'product': - $params = "programID=&extra=from=global"; - break; - case 'program': - $params = "parentProgramID=0&extra=from=global"; - break; - } + break; + case 'bug': + $params = "productID=$productID&branch=&extras=from=global"; + break; + case 'story': + $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global"; + break; + case 'task': + $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global"; + break; + case 'testcase': + $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; + break; + case 'execution': + $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; + break; + case 'product': + $params = "programID=&extra=from=global"; + break; + case 'program': + $params = "parentProgramID=0&extra=from=global"; + break; + } $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), " " . $lang->createObjects[$objectType], '', $attr) . '
    • '; }