From 56e91524b41ffc955ca5055133eeaf901cf55955 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Thu, 26 Mar 2015 19:27:15 +0300 Subject: [PATCH] =?UTF-8?q?ADD=20=D0=BC=D0=BE=D0=B4=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=82=D0=BE=D1=87=D0=B5=D0=BA,=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=20=D0=B1=D0=B5=D0=B7=20=D1=84=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/controllers/JsonController.php | 2 ++ ground/views/modals/addPoint.php | 4 ++++ public/js/app.js | 2 ++ 3 files changed, 8 insertions(+) diff --git a/ground/controllers/JsonController.php b/ground/controllers/JsonController.php index 8d126cb..8a991d4 100644 --- a/ground/controllers/JsonController.php +++ b/ground/controllers/JsonController.php @@ -42,6 +42,7 @@ class JsonController extends Controller $point->descriptionHtml = nl2br($point->description); $point->descriptionHtml = Helper::replaceLinks($point->descriptionHtml, '/?point='); $point->name = htmlspecialchars($point->name); + $point->moderate = $point->moderate ? 'show' : 'hide'; $imgs = $point->photos; $photosCount = 1; @@ -226,6 +227,7 @@ class JsonController extends Controller { $_POST['author'] = App::$user->id; $_POST['date'] = time(); + $_POST['moderate'] = (App::$user && App::$user->isAdmin == 1) ? $_POST['moderate'] : 0; $point->add($_POST); if (!$point->id) diff --git a/ground/views/modals/addPoint.php b/ground/views/modals/addPoint.php index 4dae78d..0a15bc9 100644 --- a/ground/views/modals/addPoint.php +++ b/ground/views/modals/addPoint.php @@ -51,6 +51,10 @@ diff --git a/public/js/app.js b/public/js/app.js index 68d29aa..6fa6487 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -287,6 +287,7 @@ function addPoint() source: $('#addPointSource').val(), lat: $('#addPointLat').val(), lng: $('#addPointLng').val(), + moderate: $('#moderate').val() == 'show' ? 1:0, id: id }, success: function (data) { @@ -387,6 +388,7 @@ function editPoint(id) $('#addPointSource').val(pointsSources[id].source); $('#addPointLat').val(pointsSources[id].lat); $('#addPointLng').val(pointsSources[id].lng); + $('#moderate').val(pointsSources[id].moderate); $('.extraImage', '#imgsContainer').remove(); if (pointsSources[id].images != undefined && pointsSources[id].images.length > 0)