Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for bug.

Browse Source
This commit is contained in:
wangyidong
2019-06-17 09:46:27 +08:00
parent 811d68443c
commit f43dc5c082
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -76,7 +76,7 @@ zentaoxx:
mkdir zentaoxx/db/
cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
rm -rf zentaoxx/db_bak/
sed -i 's/xxbVersion/$(XVERSION)/g' zentaoxx/config/ext/xuanxuan.php
sed -i 's/XXBVERSION/$(XVERSION)/g' zentaoxx/config/ext/xuanxuan.php
sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend = 'zentao';" zentaoxx/config/ext/xuanxuan.php
sed -i 's/site,//' zentaoxx/module/chat/model.php
sed -i 's/admin, g/g/' zentaoxx/module/chat/model.php
module/build/css/create.css
+1 -1
View File
@@ -1 +1 @@
#product_chosen .chosen-single{border-right:0px;}
#branch_chosen .chosen-single{border-left:0px;}
module/common/model.php
+6 -4
View File
@@ -382,10 +382,12 @@ class commonModel extends model
$link['vars'] = $subMenuParams;
$menu = new stdclass();
$menu->name = $subMenuKey;
$menu->link = $link;
$menu->text = $subMenuName;
$menu->hidden = false;
$menu->name = $subMenuKey;
$menu->link = $link;
$menu->text = $subMenuName;
$menu->subModule = isset($items->$subMenuKey['subModule']) ? $items->$subMenuKey['subModule'] : '';
$menu->alias = isset($items->$subMenuKey['alias']) ? $items->$subMenuKey['alias'] : '';
$menu->hidden = false;
$subMenu[$subMenuKey] = $menu;
}
module/cron/model.php
+1 -2
View File
@@ -62,7 +62,7 @@ class cronModel extends model
$parsedCron['schema'] = trim($matchs[0][0]);
$parsedCron['command'] = trim($matchs[0][1]);
$parsedCron['cron'] = CronExpression::factory($parsedCron['schema']);
$parsedCron['time'] = $parsedCron['cron']->getNextRunDate();
$parsedCron['time'] = $parsedCron['cron']->getNextRunDate($cron->lastTime);
$parsedCrons[$cron->id] = $parsedCron;
}
catch(InvalidArgumentException $e)
@@ -72,7 +72,6 @@ class cronModel extends model
}
}
}
$this->dao->update(TABLE_CRON)->set('lastTime')->eq(date(DT_DATETIME1))->where('lastTime')->eq('0000-00-00 00:00:00')->andWhere('status')->ne('stop')->exec();
return $parsedCrons;
}
module/dept/model.php
+1 -1
View File
@@ -98,7 +98,7 @@ class deptModel extends model
}
}
$topMenu = @array_pop($deptMenu);
$topMenu = isset($deptMenu[0]) ? $deptMenu[0] : array_pop($deptMenu);
$topMenu = explode("\n", trim($topMenu));
$lastMenu[] = '/';
foreach($topMenu as $menu)
module/project/model.php
+2 -2
View File
@@ -127,11 +127,11 @@ class projectModel extends model
foreach($subMenu as $menuKey => $menu)
{
$itemMenu = zget($projectSubMenu, $menuKey, '');
if($moduleName == strtolower($menu->link['module']) and
if(($moduleName == strtolower($menu->link['module']) and
(
$methodName == strtolower($menu->link['method']) or
(is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false)
)
)) or (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false)
)
{
$this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);