v0.5.0

alexander-torosh · Nov 13, 2016 · dc5aa9c · dc5aa9c · pletsky · Nov 17, 2016
1 parent 2735018
commit dc5aa9c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 21 deletions.
diff --git a/app/modules/Publication/Controller/IndexController.php b/app/modules/Publication/Controller/IndexController.php
@@ -13,41 +13,55 @@ class IndexController extends Controller
 
     public function indexAction()
     {
-        $type = $this->dispatcher->getParam('type', 'string');
+        $type      = $this->dispatcher->getParam('type', 'string');
         $typeModel = Type::getCachedBySlug($type);
         if (!$typeModel) {
             throw new Exception("Publication hasn't type = '$type''");
         }
 
         $typeLimit = ($typeModel->getLimit()) ? $typeModel->getLimit() : 10;
-        $limit = $this->request->getQuery('limit', 'string', $typeLimit);
+        $limit     = $this->request->getQuery('limit', 'string', $typeLimit);
         if ($limit != 'all') {
-            $paginatorLimit = (int) $limit;
+            $paginatorLimit = (int)$limit;
         } else {
             $paginatorLimit = 9999;
         }
         $page = $this->request->getQuery('page', 'int', 1);
 
-        $publications = Publication::find(array(
+        /*$publications = Publication::find(array(
             "type_id = {$typeModel->getId()}",
             "order" => "date DESC",
-        ));
+        ));*/
+
+        $publicationHelper = new PublicationHelper();
+        $fields = $publicationHelper->translateFieldsSubQuery();
+
+        $columns = ['p.*', 't_slug' => 't.slug'];
+        $columns = array_merge($columns, $fields);
+
+        $qb = $this->modelsManager->createBuilder()
+            ->columns($columns)
+            ->addFrom('Publication\Model\Publication', 'p')
+            ->leftJoin('Publication\Model\Type', null, 't')
+            ->andWhere('t.slug = :type:', ['type' => 'news'])
+            ->andWhere('p.date <= NOW()')
+            ->orderBy('p.date DESC');
 
-        $paginator = new \Phalcon\Paginator\Adapter\Model(array(
-            "data" => $publications,
+        $paginator = new \Phalcon\Paginator\Adapter\QueryBuilder([
+            "builder"  => $qb,
             "limit" => $paginatorLimit,
-            "page" => $page
-        ));
+            "page"  => $page
+        ]);
 
         $this->view->paginate = $paginator->getPaginate();
 
         $this->helper->title()->append($typeModel->getHeadTitle());
         if ($page > 1) {
             $this->helper->title()->append($this->helper->translate('Страница №') . ' ' . $page);
         }
-        $this->view->title = $typeModel->getTitle();
+        $this->view->title  = $typeModel->getTitle();
         $this->view->format = $typeModel->getFormat();
-        $this->view->type = $type;
+        $this->view->type   = $type;
 
         $this->helper->menu->setActive($type);
     }

diff --git a/app/modules/Publication/views/index/format/grid.volt b/app/modules/Publication/views/index/format/grid.volt
@@ -1,20 +1,20 @@
 {% set image = helper.image([
-'id': item.getId(),
+'id': item.p.getId(),
 'type': 'publication',
 'width': 300,
 'height': 240,
 'strategy': 'a'
 ]) %}
-{% set link = helper.langUrl(['for':'publication', 'type':item.getTypeSlug(), 'slug':item.getSlug()]) %}
+{% set link = helper.langUrl(['for':'publication', 'type':item.t_slug, 'slug':item.p.getSlug()]) %}
 {% if image.isExists() %}{% set imageExists = true %}{% else %}{% set imageExists = false %}{% endif %}
 <div class="item">
     {% if imageExists %}
         <a class="image" href="{{ link }}">{{ image.imageHTML() }}</a>
     {% endif %}
     <div class="text">
-        <section class="date">{{ item.getDate('d.m.Y') }}</section>
-        <a href="{{ link }}" class="title">{{ item.getTitle() }}</a>
-        <section class="announce">{{ helper.announce(item.getText(), 300) }}</section>
+        <section class="date">{{ item.p.getDate('d.m.Y') }}</section>
+        <a href="{{ link }}" class="title">{{ item.title }}</a>
+        <section class="announce">{{ helper.announce(item.text, 300) }}</section>
 
         <a href="{{ link }}" class="details">{{ helper.translate('Подробнее') }} &rarr;</a>
     </div>

diff --git a/app/modules/Publication/views/index/format/list.volt b/app/modules/Publication/views/index/format/list.volt
@@ -1,19 +1,19 @@
 {% set image = helper.image([
-'id': item.getId(),
+'id': item.p.getId(),
 'type': 'publication',
 'width': 300,
 'strategy': 'w'
 ]) %}
-{% set link = helper.langUrl(['for':'publication', 'type':item.getTypeSlug(), 'slug':item.getSlug()]) %}
+{% set link = helper.langUrl(['for':'publication', 'type':item.t_slug, 'slug':item.p.getSlug()]) %}
 {% if image.isExists() %}{% set imageExists = true %}{% else %}{% set imageExists = false %}{% endif %}
 <div class="item{% if imageExists %} with-image{% endif %}">
     {% if imageExists %}
         <a class="image" href="{{ link }}">{{ image.imageHTML() }}</a>
     {% endif %}
     <div class="text">
-        <section class="date">{{ item.getDate('d.m.Y') }}</section>
-        <a href="{{ link }}" class="title">{{ item.getTitle() }}</a>
-        <section class="announce">{{ helper.announce(item.getText(), 300) }}</section>
+        <section class="date">{{ item.p.getDate('d.m.Y') }}</section>
+        <a href="{{ link }}" class="title">{{ item.title }}</a>
+        <section class="announce">{{ helper.announce(item.text, 300) }}</section>
 
         <a href="{{ link }}" class="details">{{ helper.translate('Подробнее') }} &rarr;</a>
     </div>