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

Merge branch 'sprint/174_songchenxuan_45048' into 'master'

Browse Source 
* Finish task 45048.

See merge request easycorp/zentaopms!650
This commit is contained in:
李玉春
2021-11-29 09:37:35 +00:00
parent a3043640ae c43a6b58f5
commit 0cf53a32e0
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
-3
View File
@@ -320,7 +320,6 @@ class commonModel extends model
if($module == 'block' and $method == 'main') return true;
if($module == 'block' and $method == 'delete') return true;
if($module == 'product' and $method == 'showerrornone') return true;
if($module == 'report' and $method == 'annualdata') return true;
}
return false;
}
@@ -2150,8 +2149,6 @@ EOD;
$rights = $app->user->rights['rights'];
$acls = $app->user->rights['acls'];
if((($app->user->account != 'guest') or ($app->company->guest and $app->user->account == 'guest')) and $module == 'report' and $method == 'annualdata') return true;
if(isset($rights[$module][$method]))
{
if(!commonModel::hasDBPriv($object, $module, $method)) return false;
module/group/lang/resource.php
+8 -6
View File
@@ -1303,18 +1303,20 @@ $lang->tree->methodOrder[30] = 'delete';
/* Report. */
$lang->resource->report = new stdclass();
$lang->resource->report->index = 'index';
$lang->resource->report->projectDeviation = 'projectDeviation';
$lang->resource->report->productSummary = 'productSummary';
$lang->resource->report->bugCreate = 'bugCreate';
$lang->resource->report->bugAssign = 'bugAssign';
$lang->resource->report->workload = 'workload';
$lang->resource->report->index = 'index';
$lang->resource->report->projectDeviation = 'projectDeviation';
$lang->resource->report->productSummary = 'productSummary';
$lang->resource->report->bugCreate = 'bugCreate';
$lang->resource->report->bugAssign = 'bugAssign';
$lang->resource->report->workload = 'workload';
$lang->resource->report->annualData = 'annual';
$lang->report->methodOrder[0] = 'index';
$lang->report->methodOrder[5] = 'projectDeviation';
$lang->report->methodOrder[10] = 'productSummary';
$lang->report->methodOrder[15] = 'bugCreate';
$lang->report->methodOrder[20] = 'workload';
$lang->report->methodOrder[25] = 'annual';
/* Search. */
$lang->resource->search = new stdclass();