Skip to content

Commit ba1f5cb

Browse files
committed
fix: Fix loading sample gk
1 parent 55d8890 commit ba1f5cb

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

website/app/GeoKrety/Controller/Pages/Base.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,5 @@ protected function checkGK($geokret) {
157157
\Flash::instance()->addMessage('This page could not be loaded as there is not enough existing GeoKrety in database.', 'danger');
158158
$this->f3->reroute('@home');
159159
}
160-
161-
if (\is_null($geokret->last_log)) {
162-
\Flash::instance()->addMessage('GeoKrety for help page must have already moved.', 'danger');
163-
$this->f3->reroute('@home');
164-
}
165160
}
166161
}

website/app/GeoKrety/Controller/Pages/GeokretyLabels.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class GeokretyLabels extends Base {
1717

1818
public function get(\Base $f3) {
1919
$geokret = new GeokretWithDetails();
20-
$geokret->load(['gkid = ?', GK_HELP_GEOKRETY_EXAMPLE_5]);
20+
$geokret->load(['id = ?', GK_HELP_GEOKRETY_EXAMPLE_5]);
2121
Smarty::assign('gk_example_5_tc', $geokret->tracking_code);
2222
Smarty::render('pages/geokrety_labels.tpl');
2323
}

website/app/GeoKrety/Controller/Pages/MoveCreate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ public function get(\Base $f3) {
8989
}
9090

9191
$geokret = new GeokretWithDetails();
92-
$geokret->load(['gkid = ?', GK_HELP_GEOKRETY_EXAMPLE_2], ttl: GK_HELP_GEOKRETY_EXAMPLE_TTL);
92+
$geokret->load(['id = ?', GK_HELP_GEOKRETY_EXAMPLE_2], ttl: GK_HELP_GEOKRETY_EXAMPLE_TTL);
9393
Smarty::assign('gk_example_2_tc', $geokret->tracking_code);
94-
$geokret->load(['gkid = ?', GK_HELP_GEOKRETY_EXAMPLE_3], ttl: GK_HELP_GEOKRETY_EXAMPLE_TTL);
94+
$geokret->load(['id = ?', GK_HELP_GEOKRETY_EXAMPLE_3], ttl: GK_HELP_GEOKRETY_EXAMPLE_TTL);
9595
Smarty::assign('gk_example_3_tc', $geokret->tracking_code);
9696
Smarty::render('pages/geokret_move.tpl');
9797
}

website/app/GeoKrety/Service/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function __construct() {
118118
define('GK_F3_DEBUG', false);
119119
define('GK_DEVEL', false);
120120
define('GK_HELP_GEOKRETY_EXAMPLE_1', getenv('GK_HELP_GEOKRETY_EXAMPLE_1') ?: 46657);
121-
define('GK_HELP_GEOKRETY_EXAMPLE_2', getenv('GK_HELP_GEOKRETY_EXAMPLE_2') ?: 65509);
121+
define('GK_HELP_GEOKRETY_EXAMPLE_2', getenv('GK_HELP_GEOKRETY_EXAMPLE_2') ?: 65508);
122122
define('GK_HELP_GEOKRETY_EXAMPLE_3', getenv('GK_HELP_GEOKRETY_EXAMPLE_3') ?: 66148);
123123
define('GK_HELP_GEOKRETY_EXAMPLE_4', getenv('GK_HELP_GEOKRETY_EXAMPLE_4') ?: 74526);
124124
define('GK_HELP_GEOKRETY_EXAMPLE_5', getenv('GK_HELP_GEOKRETY_EXAMPLE_5') ?: 106724);

0 commit comments

Comments
 (0)