Skip to content

Commit

Permalink
Version preps
Browse files Browse the repository at this point in the history
  • Loading branch information
coastforge-mei committed Oct 13, 2022
1 parent 9a26424 commit f9626e1
Show file tree
Hide file tree
Showing 10 changed files with 340 additions and 90 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"require": {
"php": "^7.4 || ^8.0",
"contao/core-bundle": "^4.9",
"con4gis/core": "^v6.0.15",
"con4gis/core": "^v6.0.16",
"menatwork/contao-multicolumnwizard-bundle": "^3.5.7",
"doctrine/orm": "^2.8.5",
"doctrine/data-fixtures": "^1.4.4",
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build-prod": "webpack --config webpack.production.config.js && gulp deploy"
},
"devDependencies": {
"bootstrap": "^5.2.1",
"bootstrap": "^5.2.2",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^5.2.7",
"echo-loader": "0.0.1",
Expand All @@ -24,7 +24,7 @@
"gulp-sass": "^4.1.1",
"gulp-sourcemaps": "^2.6.5",
"gulp-uglify": "^3.0.2",
"postcss": "^8.4.16",
"postcss": "^8.4.18",
"postcss-loader": "^5.3.0",
"raw-loader": "^4.0.2",
"style-loader": "^2.0.0",
Expand Down
14 changes: 9 additions & 5 deletions src/Classes/Maps/C4GBrickMapFrontendParent.php
Original file line number Diff line number Diff line change
Expand Up @@ -765,11 +765,15 @@ public function createMapStructureChilds($arrData, $arrChildData, $sort = true)
$arrSortedData = ArrayHelper::array_sort($arrChildData, 'name', SORT_ASC, true);
}

foreach ($arrSortedData as $key => $arrSortedDataValue) {
$arrSortedData[$key]['pid'] = $arrData['id'];
if ($arrSortedData[$key]['content'] != null) {
$arrSortedData[$key]['content'][0]['id'] = $arrSortedDataValue['id'] + 1;
$arrSortedData[$key]['content'][0]['data']['position']['positionId'] = $arrSortedDataValue['id'] + 1;
if (is_array($arrSortedData)) {
foreach ($arrSortedData as $key => $arrSortedDataValue) {
if ($arrSortedData[$key] && is_array($arrSortedData[$key])) {
$arrSortedData[$key]['pid'] = $arrData['id'];
if ($arrSortedData[$key]['content'] != null) {
$arrSortedData[$key]['content'][0]['id'] = $arrSortedDataValue['id'] + 1;
$arrSortedData[$key]['content'][0]['data']['position']['positionId'] = $arrSortedDataValue['id'] + 1;
}
}
}
}

Expand Down
Loading

0 comments on commit f9626e1

Please sign in to comment.