From 78a6d50b9acb93a47f6b77544f350f0b85601fc6 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Fri, 18 Sep 2015 18:30:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81=D1=81?= =?UTF-8?q?=D1=8B=D0=BB=D0=BE=D0=BA=20=D0=BD=D0=B0=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=D0=B8,=20=D0=B2=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D1=8B=D1=85=20=D1=83=D0=BF=D0=BE=D0=BC=D0=B8=D0=BD=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=82=D0=BE=D1=87=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/controllers/PointController.php | 11 +++++++++++ ground/models/Article.php | 2 +- ground/views/point.php | 17 +++++++++++++++-- public/img/noPhoto200150.png | Bin 0 -> 7907 bytes 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 public/img/noPhoto200150.png diff --git a/ground/controllers/PointController.php b/ground/controllers/PointController.php index bc12d53..2c46e21 100644 --- a/ground/controllers/PointController.php +++ b/ground/controllers/PointController.php @@ -75,6 +75,16 @@ class PointController extends Controller $randomPoint->description = mb_substr($randomPoint->description, 0, 400, 'UTF-8'); $randomPoint->description = Helper::replaceLinks($randomPoint->description); + $articlePoints = ArticlePoints::model()->getAll(array('where'=>'`pointId` = '.$pointId)); + $articleIds = array(); + $articles = array(); + if ($articlePoints) { + foreach ($articlePoints as $articlePoint) { + $articleIds[] = (int)$articlePoint->articleId; + } + $articles = Article::model()->getAll(array('where'=>'`id` IN ('. implode(',', $articleIds).')')); + } + self::render('point.php', array( 'point' => $point, 'text' => $items[0], @@ -88,6 +98,7 @@ class PointController extends Controller 'og' => Helper::buildOG($point), 'user' => App::$user, 'photoLinks' => $photoLinksRes, + 'articles' => $articles, )); } else { App::error404(); diff --git a/ground/models/Article.php b/ground/models/Article.php index 9dde028..e27e71a 100644 --- a/ground/models/Article.php +++ b/ground/models/Article.php @@ -28,7 +28,7 @@ class Article extends Model } - return '/img/logo.png'; + return $size == 'small' ? '/img/noPhoto200150.png' : '/img/logo.png'; } } diff --git a/ground/views/point.php b/ground/views/point.php index 240c384..0c37a8d 100644 --- a/ground/views/point.php +++ b/ground/views/point.php @@ -89,9 +89,20 @@ $index = 0;
+
-

Поблизости:

+

Эта точка в статьях:

+ + + +
+
+
+ +
+
+

Поблизости расположены:

нет известных нам точек. @@ -100,13 +111,15 @@ $index = 0;

+
-

Похожие:

+

Похожие точки:


+
diff --git a/public/img/noPhoto200150.png b/public/img/noPhoto200150.png new file mode 100644 index 0000000000000000000000000000000000000000..65cd124ca0af03b3d6d92d43bbcabacd54b027de GIT binary patch literal 7907 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 N002ovPDHLkV1g(&1a|-c literal 0 HcmV?d00001