Merge branch 'sprint/max43_mayue_bug#26655' into 'master'

* Fix bug #26655.

See merge request easycorp/zentaopms!5066
This commit is contained in:
孙广明
2022-08-23 07:28:05 +00:00
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
$(function()
{
$('#subNavbar .nav li').removeClass('active');
$('#subNavbar .nav li').removeClass('active');
$('#subNavbar .nav li[data-id=' + type + ']').addClass('active');
$('#subNavbar .nav li > a').each(function()
@@ -8,7 +8,7 @@ $(function()
var type = $(this).parent().attr('data-id');
if(type == 'bysearch') return;
type = type == 'all' ? type : type.toUpperCase();
type = type == 'all' ? type : type.toLowerCase();
var href = createLink('design', 'browse', 'projectID=' + projectID + '&productID=' + productID + '&type=' + type);
$(this).attr('href', href);
});
+1
View File
@@ -408,6 +408,7 @@ class designModel extends model
$this->lang->waterfall->menu->design['subMenu']->all = array('link' => "{$this->lang->all}|design|browse|projectID=%s&productID=0&browseType=all");
foreach(array_filter($this->lang->design->typeList) as $key => $value)
{
$key = strtolower($key);
$this->lang->waterfall->menu->design['subMenu']->$key = array('link' => "{$value}|design|browse|projectID=%s&productID=0&browseType={$key}");
}