浏览代码

Merge branch 'develop'

develop
Guillaume 2 年前
父节点
当前提交
f38f3ebcba
共有 4 个文件被更改,包括 18 次插入2 次删除
  1. +1
    -0
      Container/ComponentContainer.php
  2. +2
    -2
      Definition/Field/Site/PageFieldDefinition.php
  3. +14
    -0
      Repository/AbstractRepositoryQuery.php
  4. +1
    -0
      Resources/translations/admin.fr.yaml

+ 1
- 0
Container/ComponentContainer.php 查看文件

@@ -2,6 +2,7 @@

namespace Lc\SovBundle\Container;

use Lc\SovBundle\Component\ArrayComponent;
use Lc\SovBundle\Component\CitiesComponent;
use Lc\SovBundle\Component\CookieComponent;
use Lc\SovBundle\Component\DateComponent;

+ 2
- 2
Definition/Field/Site/PageFieldDefinition.php 查看文件

@@ -18,7 +18,7 @@ class PageFieldDefinition extends AbstractFieldDefinition
];
}

public function configurePanelMain(): array
public function configurePanelGeneral(): array
{
return [
'title',
@@ -29,7 +29,7 @@ class PageFieldDefinition extends AbstractFieldDefinition

public function configurePanels(): array
{
return ['main', 'seo', 'conf'];
return ['general', 'seo', 'conf'];
}

public function configureFields(): array

+ 14
- 0
Repository/AbstractRepositoryQuery.php 查看文件

@@ -222,5 +222,19 @@ abstract class AbstractRepositoryQuery implements RepositoryQueryInterface
{
return $this->andWhere('.status >= 0');
}

/*
* POSITION
*/

public function filterByPositionBiggerThan(int $position)
{
return $this->andWhere('.position > :position')->setParameter('position', $position);
}

public function filterByPositionSmallerThan(int $position)
{
return $this->andWhere('.position < :position')->setParameter('position', $position);
}
}


+ 1
- 0
Resources/translations/admin.fr.yaml 查看文件

@@ -148,6 +148,7 @@ entity:
panels:
general: Général
configuration: Configuration
conf: Configuration
gallery: Galerie
seo: Référencement
opengraph: Opengraph

正在加载...
取消
保存