Skip to content

Commit ee74dde

Browse files
thisismeonmounteverestthisismeonmounteverest
andauthored
Continuing work on profile and subsequent pages (#391)
* Finishing profile pages. * Warmup cache so that translation are available for Javascript. * Warmup cache for test environment to be able to access database. * Fixing code smells. * Working on migration of database content and profile pages. * Fixing code smells. * Fix code smells. * Add new translations and update with latest from production. * Fixing gallery display and upload. * Update old translation code. Allow to delete reused translation ids. * Bump versions. * Several bugfixes to new profile pages after tests. * Applying static to closures. --------- Co-authored-by: thisismeonmounteverest <[email protected]>
1 parent 14e8b6b commit ee74dde

File tree

70 files changed

+115194
-33896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+115194
-33896
lines changed

assets/js/calendar.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ export { initializeCalendar }
77
const htmlTag = document.getElementsByTagName('html')[0];
88
const lang = htmlTag.attributes['lang'].value;
99

10-
const minimumAge = dayjs().subtract(18, 'year');
11-
const maximumAge = minimumAge.subtract(122, 'year');
10+
const now = dayjs()
11+
const minimumAge = now.subtract(18, 'year');
12+
const maximumAge = now.subtract(120, 'year');
1213

1314
const options = {
1415
inputMode: true,

assets/scss/bewelcome.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ a.active .metric .value {
261261
}
262262

263263
.community-news-wrapper img,
264+
.accommodation img,
264265
figure > img {
265266
max-width: 100%;
266267
height: auto;

build/gallery/gallery.model.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ public function getLatestItems($userId = false, $galleryId = false, $numRows = f
368368
a.`title` AS album,
369369
a.`id` AS albumId
370370
FROM `gallery_items` AS i
371-
LEFT JOIN `members` AS `m` ON
371+
LEFT JOIN `member` AS `m` ON
372372
m.`id` = i.`user_id_foreign`
373373
LEFT JOIN `gallery_items_to_gallery` AS `g` ON
374374
g.`item_id_foreign` = i.`id`
@@ -414,7 +414,7 @@ public function getNextItems($imageId,$limit = 1,$userId = false,$galleryId = fa
414414
i.`title`,
415415
i.`created`
416416
FROM `gallery_items` AS i
417-
LEFT JOIN `members` AS `m` ON
417+
LEFT JOIN `member` AS `m` ON
418418
m.`id` = i.`user_id_foreign`
419419
WHERE i.`id` > '.(int)$imageId.'
420420
';
@@ -448,7 +448,7 @@ public function getPreviousItems($imageId,$limit = 1,$userId = false,$galleryId
448448
i.`title`,
449449
i.`created`
450450
FROM `gallery_items` AS i
451-
LEFT JOIN `members` AS `m` ON
451+
LEFT JOIN `member` AS `m` ON
452452
m.`id` = i.`user_id_foreign`
453453
WHERE i.`id` < '.(int)$imageId.'
454454
';
@@ -517,7 +517,7 @@ public function imageData($itemId)
517517
i.`description`,
518518
i.`created`
519519
FROM `gallery_items` AS i,
520-
members as m
520+
member as m
521521
WHERE i.`id` = ". (int)$itemId . "
522522
AND m.id = i.user_id_foreign
523523
AND m.Status IN ('Active', 'ChoiceInactive', 'Pending', 'OutOfRemind')

build/search/search.model.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -601,12 +601,12 @@ private function getDetailsForMembers()
601601
) c ON c.IdToMember = m.id
602602
LEFT JOIN (
603603
SELECT
604-
COUNT(*) As photoCount, IdMember
604+
COUNT(*) As photoCount, member_id
605605
FROM
606-
membersphotos
606+
member_photo
607607
GROUP BY
608-
IdMember
609-
) mp ON mp.IdMember = m.id
608+
member_id
609+
) mp ON mp.member_id = m.id
610610
WHERE
611611
{$this->maxGuestCondition}
612612
{$this->statusCondition}
@@ -792,13 +792,13 @@ public function prepareQuery($vars, $adminUnits = [], $country = false)
792792
$this->joins .= "
793793
LEFT JOIN (
794794
SELECT
795-
COUNT(*) As photoCount, IdMember
795+
COUNT(*) As photoCount, member_id
796796
FROM
797-
membersphotos
797+
member_photo
798798
GROUP BY
799-
IdMember) mp
799+
member_id) mp
800800
ON
801-
mp.IdMember = m.id
801+
mp.member_id = m.id
802802
";
803803
}
804804
if (!empty($this->commentsCondition)) {

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"nelmio/security-bundle": "3.*",
4848
"nesbot/carbon": "3.*",
4949
"pagerfanta/pagerfanta": "^v4.4.0",
50-
"phpdocumentor/reflection-docblock": "^6.0",
50+
"phpdocumentor/reflection-docblock": "^5.2",
5151
"phpstan/phpdoc-parser": "^2.3",
5252
"ramsey/uuid-doctrine": "2.*",
5353
"stof/doctrine-extensions-bundle": "^1.7",

0 commit comments

Comments
 (0)