From 0c2651b436fefb2b991e3e9db2afe9455b81c748 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 27 Apr 2022 07:45:27 +0000
Subject: [PATCH 1/8] * Fix bug #22038.

---
 lib/base/front/front.class.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index fce5e33cc0..eddd8a7fe9 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -509,7 +509,17 @@ class baseHTML
             setcookie('goback', json_encode($gobackList), $config->cookieLife, $config->webRoot, '', $config->cookieSecure, false);
         }
 
-        return  "<a href='{$gobackLink}' class='btn btn-back $class' $misc>{$label}</a>";
+        $dataApp = '';
+        foreach($gobackList as $locateApp => $locateLink)
+        {
+            if($gobackLink == $locateLink)
+            {
+                $dataApp = $locateApp;
+                continue;
+            }
+        }
+
+        return  "<a href='{$gobackLink}' class='btn btn-back $class' data-app='$dataApp' $misc>{$label}</a>";
     }
 
     /**

From e2aa928abe0aabe50f632c8b4bc1a11a39630717 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 02:57:42 +0000
Subject: [PATCH 2/8] * Fix bug #22038.

---
 lib/base/front/front.class.php            | 13 +++----------
 module/program/view/browsebylist.html.php |  2 +-
 module/project/model.php                  |  1 +
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index eddd8a7fe9..5453697c61 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -509,17 +509,10 @@ class baseHTML
             setcookie('goback', json_encode($gobackList), $config->cookieLife, $config->webRoot, '', $config->cookieSecure, false);
         }
 
-        $dataApp = '';
-        foreach($gobackList as $locateApp => $locateLink)
-        {
-            if($gobackLink == $locateLink)
-            {
-                $dataApp = $locateApp;
-                continue;
-            }
-        }
+        $dataApp = array_search($gobackLink, $gobackList) ? array_search($gobackLink, $gobackList) : '';
+        $dataApp = empty($dataApp) ? '' : "data-app='$dataApp'";
 
-        return  "<a href='{$gobackLink}' class='btn btn-back $class' data-app='$dataApp' $misc>{$label}</a>";
+        return  "<a href='{$gobackLink}' class='btn btn-back $class' $dataApp $misc>{$label}</a>";
     }
 
     /**
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index ae32d22a17..26b7a53e87 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -126,7 +126,7 @@
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>
-              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", '', "data-app='project'");?>
+              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id", $program, 'list', 'link', '', '', false, "data-group='project'", '', $program->id);?>
               <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&module=project&from=browse", $program, 'list', 'shield-check', '', "$class", '', "data-app='project'");?>
               <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->delete}' data-group='program'");?>
             </ul>
diff --git a/module/project/model.php b/module/project/model.php
index adacde8868..b1ed4dd278 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1785,6 +1785,7 @@ class projectModel extends model
                             echo "<div class='btn-group'>";
                             echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                             echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                            if($from == 'pgmproject') $dataApp = 'program';
                             common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp . $attr, $this->lang->project->manageProducts);
                             if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                             if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");

From fd522561223a78729ec1f1a18d04895ac204712e Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 03:27:09 +0000
Subject: [PATCH 3/8] * Fix bug #22038.

---
 lib/base/front/front.class.php            | 2 +-
 module/program/view/browsebylist.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index 5453697c61..a2ebdd9851 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -512,7 +512,7 @@ class baseHTML
         $dataApp = array_search($gobackLink, $gobackList) ? array_search($gobackLink, $gobackList) : '';
         $dataApp = empty($dataApp) ? '' : "data-app='$dataApp'";
 
-        return  "<a href='{$gobackLink}' class='btn btn-back $class' $dataApp $misc>{$label}</a>";
+        return "<a href='{$gobackLink}' class='btn btn-back $class' $dataApp $misc>{$label}</a>";
     }
 
     /**
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 26b7a53e87..e74e5694d9 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -126,7 +126,7 @@
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>
-              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id", $program, 'list', 'link', '', '', false, "data-group='project'", '', $program->id);?>
+              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", false, "data-app='program'", '', $program->id);?>
               <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&module=project&from=browse", $program, 'list', 'shield-check', '', "$class", '', "data-app='project'");?>
               <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->delete}' data-group='program'");?>
             </ul>

From 5db8ea88b1b98583ec9ccf14ea0c9892996aea33 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 05:08:03 +0000
Subject: [PATCH 4/8] * Fix bug #22038.

---
 module/program/view/browsebylist.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index e74e5694d9..2b9f01d282 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -126,7 +126,7 @@
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>
-              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", false, "data-app='program'", '', $program->id);?>
+              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", '', "data-app={$this->app->tab}", '', $program->id);?>
               <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&module=project&from=browse", $program, 'list', 'shield-check', '', "$class", '', "data-app='project'");?>
               <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->delete}' data-group='program'");?>
             </ul>

From 79675da1e0d86a4123221f43895561a56d8f4982 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 05:11:23 +0000
Subject: [PATCH 5/8] * Fix bug #220.38.

---
 module/program/view/browsebylist.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 2b9f01d282..3271346cda 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -126,7 +126,7 @@
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>
-              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", '', "data-app={$this->app->tab}", '', $program->id);?>
+              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", '', "data-app={$this->app->tab}");?>
               <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&module=project&from=browse", $program, 'list', 'shield-check', '', "$class", '', "data-app='project'");?>
               <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->delete}' data-group='program'");?>
             </ul>

From c89922b002a9bd2cd107ea174c5c998d6c86e676 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 05:16:24 +0000
Subject: [PATCH 6/8] * Fix bug #22038.

---
 module/project/model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index b1ed4dd278..437eea5058 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1785,8 +1785,7 @@ class projectModel extends model
                             echo "<div class='btn-group'>";
                             echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                             echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                            if($from == 'pgmproject') $dataApp = 'program';
-                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp . $attr, $this->lang->project->manageProducts);
+                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $this->app->tab . $attr, $this->lang->project->manageProducts);
                             if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                             if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
                             echo "</ul>";

From b6a70926ab477bfbbac671c5af2b81abd3abbbc6 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 08:09:57 +0000
Subject: [PATCH 7/8] * Fix bug #22038.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 437eea5058..4ffe63b30a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1785,7 +1785,7 @@ class projectModel extends model
                             echo "<div class='btn-group'>";
                             echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                             echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $this->app->tab . $attr, $this->lang->project->manageProducts);
+                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', '', $this->lang->project->manageProducts);
                             if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                             if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
                             echo "</ul>";

From d6d13aa14b98ec450a4c80f680ae8a1f35739fd3 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 28 Apr 2022 08:12:11 +0000
Subject: [PATCH 8/8] * Fix bug #22038.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 4ffe63b30a..edaed577f0 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1785,7 +1785,7 @@ class projectModel extends model
                             echo "<div class='btn-group'>";
                             echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                             echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', '', $this->lang->project->manageProducts);
+                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $attr, $this->lang->project->manageProducts);
                             if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                             if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
                             echo "</ul>";