From b718cd36e37fd4bec824223312cbb989df0ca98a Mon Sep 17 00:00:00 2001 From: Ste Vaidis Date: Thu, 18 Apr 2024 10:11:15 +0300 Subject: [PATCH] more good code --- .../src/Controller/NodesController.php | 31 +++++++++++++------ toolbox/backup.sh | 2 +- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/endpoints/endpoint_get_AAAAA/src/Controller/NodesController.php b/endpoints/endpoint_get_AAAAA/src/Controller/NodesController.php index 76ed26b..efe77c6 100644 --- a/endpoints/endpoint_get_AAAAA/src/Controller/NodesController.php +++ b/endpoints/endpoint_get_AAAAA/src/Controller/NodesController.php @@ -187,6 +187,15 @@ class NodesController extends ControllerBase implements ContainerInjectionInterf } } + /* pager: ?offset=0&limit=3 */ + $offset = $request->get('offset'); + $limit = $request->get('limit'); + if (isset($offset) && isset($limit)) { + $offset = intval($offset); + $limit = intval($limit); + $query->range($offset, $limit); + } + /* execute query to get node ids */ $nodeIds = $query ->condition('type', self::NODE_TYPE) @@ -198,14 +207,18 @@ class NodesController extends ControllerBase implements ContainerInjectionInterf ->getStorage('node') ->loadMultiple($nodeIds); - /* Response List */ - $nodeList=[]; - foreach ($nodes as $node) { - $tid = $node->id(); - $nodeList[$tid] = $node->hasTranslation($lang) ? $node->getTranslation($lang) : $node; - $node->currentTranslation = $lang; - } - return $nodeList; + /* build the response list of nodes */ + $nodeList=[]; + foreach ($nodes as $node) { + if ($node instanceof NodeInterface && $node->access('view')) { + $tid = $node->id(); + $translatedNode = $node->hasTranslation($lang) ? $node->getTranslation($lang) : $node; + $translatedNode->currentTranslation = $lang; + $nodeList[$tid] = $translatedNode; + } + } + return $nodeList; + } - // \Drupal::logger('Bundle AAAAA')->notice(''.$some_var); + // \Drupal::logger('Bundle AAAAA')->notice(''.$some_var); } diff --git a/toolbox/backup.sh b/toolbox/backup.sh index afbbc19..c2448e4 100755 --- a/toolbox/backup.sh +++ b/toolbox/backup.sh @@ -2,7 +2,7 @@ DIR_PATH=${1} DIR=$(/usr/bin/basename ${DIR_PATH}) -LOG="${DIR}.log" +LOG="${DIR}.backup.log" TIMESTAMP=$(/usr/bin/date +%Y/%m/%d' '%H:%M:%S) #