From ca41001014505103d41c43c908190ed884fa0ffa Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 21 Apr 2021 09:05:50 +0800
Subject: [PATCH] * Fix bug #12260.

---
 module/project/control.php               | 2 +-
 module/project/view/createguide.html.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index b492c3e6e1..f2e656dde3 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -293,7 +293,7 @@ class project extends control
             }
         }
 
-        if($programID) $this->loadModel('program')->setMenu($programID);
+        if($this->app->openApp == 'program') $this->loadModel('program')->setMenu($programID);
 
         $name      = '';
         $code      = '';
diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php
index 56511a3d7f..db2a858226 100644
--- a/module/project/view/createguide.html.php
+++ b/module/project/view/createguide.html.php
@@ -10,7 +10,6 @@
   #guideDialog .project-type-img:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,0,.25);}
   #guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
   </style>
-  <?php $group = $from == 'PGM' ? "data-group='project'" : "data-group='project'";?>
   <div class='modal-content'>
     <div class='modal-body'>
       <button class="close" data-dismiss="modal">x</button>
@@ -18,14 +17,14 @@
       <div class='row'>
         <div class='col-xs-6'>
           <div class='project-type text-center'>
-            <?php echo html::a($this->createLink("project", "create", "model=scrum&projectID=$projectID"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', $group)?>
+            <?php echo html::a($this->createLink("project", "create", "model=scrum&projectID=$projectID"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', "data-app='{$app->openApp}'")?>
             <h3><?php echo $lang->project->scrum; ?></h3>
             <p><?php echo $lang->project->scrumTitle; ?></p>
           </div>
         </div>
         <div class='col-xs-6'>
           <div class='project-type text-center'>
-            <?php echo html::a($this->createLink("project", "create", "model=waterfall&projectID=$projectID"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', $group)?>
+            <?php echo html::a($this->createLink("project", "create", "model=waterfall&projectID=$projectID"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', "data-app='{$app->openApp}'")?>
             <h3><?php echo $lang->project->waterfall; ?></h3>
             <p><?php echo $lang->project->waterfallTitle; ?></p>
           </div>