mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Added includeGlobal to ContentTag query.

Browse Source
This commit is contained in:
buddh4 2017-08-11 18:28:25 +02:00
parent c142a9951b
commit ac49004007
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
protected/humhub/modules/content/models/ContentTag.php
View File

@ -84,6 +84,15 @@ class ContentTag extends ActiveRecord
return 'content_tag';
}
/**
* ContentTag constructor.
*
* Can be called either with an yii contfig array or with contentcontainer and name.
*
* @param array|ContentContainerActiveRecord $contentContainer
* @param null $name
* @param array $config
*/
public function __construct($contentContainer = [], $name = null, $config = [])
{
if (is_array($contentContainer)) {
@ -349,6 +358,13 @@ class ContentTag extends ActiveRecord
return $query;
}
public static function findGlobal()
{
$query = self::find();
$query->andWhere('content_tag.contentcontainer_id IS NULL');
return $query;
}
/**
* Returns Content related tags.
*
@ -409,13 +425,25 @@ class ContentTag extends ActiveRecord
/**
* Finds instances by ContentContainerActiveRecord and optional type.
*
* @param ContentContainerActiveRecord|integer $record Container instance or contentcontainer_id
* @param null $type
* @return \yii\db\ActiveQuery
* If $includeGlobal is set to true the query will also include global content tags of this type.
*
* @param $container
* @param bool $includeGlobal if true the query will include global tags as well @since 1.2.3
* @return ActiveQuery
* @internal param ContentContainerActiveRecord|int $record Container instance or contentcontainer_id
* @internal param null $type
*/
public static function findByContainer($container)
public static function findByContainer($container, $includeGlobal = false)
{
$container_id = $container instanceof ContentContainerActiveRecord ? $container->contentcontainer_id : $container;
return self::find()->andWhere(['content_tag.contentcontainer_id' => $container_id]);
if(!$includeGlobal) {
return self::find()->andWhere(['content_tag.contentcontainer_id' => $container_id]);
} else {
return self::find()->andWhere(['or',
['content_tag.contentcontainer_id' => $container_id],
'content_tag.contentcontainer_id IS NULL',
]);
}
}
}

3
protected/humhub/widgets/ContentTagDropDown.php
View File

@ -27,6 +27,7 @@ class ContentTagDropDown extends InputWidget
public $tagClass;
public $query;
public $contentContainer;
public $includeGlobal = false;
public $type = true;
public $prompt = false;
public $promptValue = 0;
@ -90,7 +91,7 @@ class ContentTagDropDown extends InputWidget
if(!$this->query) {
if($this->contentContainer) {
$this->query = call_user_func($this->tagClass .'::findByContainer', $this->contentContainer);
$this->query = call_user_func($this->tagClass .'::findByContainer', $this->contentContainer, $this->includeGlobal);
} elseif(!empty($this->type)){
$type = ($this->type === true) ? $this->tagClass : $this->type;
$this->query = call_user_func($this->tagClass .'::findByType', [$type]);