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

Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4

Browse Source
This commit is contained in:
caoyanyi
2023-04-24 08:41:17 +08:00
parent f185508411 ff2824a005
commit 53624ab47e
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/js/safe.js
+1 -1
View File
@@ -12,5 +12,5 @@ $(function()
*/
function changeWeakChange(changeWeak)
{
$('#mainContent .table td.notice').html(changeWeak == 1 ? adminLang.safe.noticeWeakMode : adminLang.safe.noticeMode);
$('#mainContent .table td.notice:first').html(changeWeak == 1 ? adminLang.safe.noticeWeakMode : adminLang.safe.noticeMode);
}
module/upgrade/model.php
+21 -13
View File
@@ -8725,12 +8725,10 @@ class upgradeModel extends model
$groupFields = $settings->group;
foreach($groupFields as $groupIndex => $groupField)
{
if($isQuoteDataview && strpos($groupField->field, '.') !== false)
{
$groupField->field = str_replace('.', '_', $groupField->field);
if(isset($groupField->dateGroup)) $groupField->group = $groupField->dateGroup;
if($isQuoteDataview && strpos($groupField->field, '.') !== false) $groupField->field = str_replace('.', '_', $groupField->field);
$groupFields[$groupIndex] = $groupField;
}
$groupFields[$groupIndex] = $groupField;
}
$settings->group = $groupFields;
@@ -8769,14 +8767,13 @@ class upgradeModel extends model
}
$settings->metric = $metricFields;
}
$data->settings = json_encode(array($settings));
}
$data->settings = json_encode(array($settings));
if(empty($data->settings))
else
{
$data->step = 1;
$data->status = 'draft';
$data->step = 1;
$data->stage = 'draft';
}
if(!empty($filters))
@@ -8907,10 +8904,15 @@ class upgradeModel extends model
}
$pivotSettings->columns = $columns;
$pivot->settings = json_encode($pivotSettings);
if(!empty($tableSettings->filter)) $filters = $tableSettings->filter;
}
else
{
$pivot->stage = 'draft';
$pivot->step = 1;
}
$pivot->settings = json_encode($pivotSettings);
if(isset($dataviewList[$table->dataset]))
{
@@ -9049,6 +9051,7 @@ class upgradeModel extends model
/* Process settings. */
$settings = new stdclass();
$settings->columns = array();
if($report->params)
{
$params = json_decode($report->params);
@@ -9080,6 +9083,11 @@ class upgradeModel extends model
}
$settings->columns = $columns;
}
else
{
$data->stage = 'draft';
$data->step = 1;
}
/* Process fieldSettings. */
$sql = $data->sql;