From 8ee31b76c5fbe4cf337f4b77aad5a01304cc79bd Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Tue, 9 May 2023 15:04:04 +0800
Subject: [PATCH] * Fix ipd project module-menu bug.

---
 module/project/js/create.js | 4 ++--
 module/project/model.php    | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/module/project/js/create.js b/module/project/js/create.js
index edd81d996c..f799516e7b 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    $('[name=hasProduct]').change(function()
+    $(document).on('change', '[name=hasProduct]', function()
     {
         const hasProduct = $('[name=hasProduct]:checked').val();
 
@@ -17,7 +17,7 @@ $(function()
             });
             if(chosenProducts > 1) $('.division').removeClass('hide');
         }
-    });
+    })
 
     $('[name=hasProduct]').change();
 
diff --git a/module/project/model.php b/module/project/model.php
index 1544068d89..3646a60288 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2836,7 +2836,6 @@ class projectModel extends model
 
         if(empty($project->hasProduct) or $model == 'ipd')
         {
-            unset($lang->project->menu->settings['subMenu']->products);
             $projectProduct = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($objectID)->fetch('product');
             $lang->project->menu->settings['subMenu']->module['link'] = sprintf($lang->project->menu->settings['subMenu']->module['link'], $projectProduct);
 
@@ -2860,8 +2859,6 @@ class projectModel extends model
                     $lang->project->menu->story['dropMenu']->story['link']       = sprintf($lang->project->menu->storyGroup['dropMenu']->story['link'], '%s', $projectProduct);
                     $lang->project->menu->story['dropMenu']->requirement['link'] = sprintf($lang->project->menu->storyGroup['dropMenu']->requirement['link'], '%s', $projectProduct);
                 }
-
-                unset($lang->project->menu->settings['subMenu']->products);
             }
         }
         else
@@ -2870,8 +2867,9 @@ class projectModel extends model
             unset($lang->project->menu->projectplan);
         }
 
-        if(isset($lang->project->menu->storyGroup)) unset($lang->project->menu->storyGroup);
-        if($model == 'ipd' and $project->hasProduct) unset($lang->project->menu->settings['subMenu']->module);
+        if(isset($lang->project->menu->storyGroup))  unset($lang->project->menu->storyGroup);
+        if($model != 'ipd' and $project->hasProduct) unset($lang->project->menu->settings['subMenu']->module);
+        if(empty($project->hasProduct))              unset($lang->project->menu->settings['subMenu']->products);
 
         /* Reset project priv. */
         $moduleName = $this->app->rawModule;