Skip to content

Changes for getAllTagsWithModelsCount #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PushOk wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Changes for getAllTagsWithModelsCount #11

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b3bf24
use empty tag as used before, but false use as tag not set
PushOk Aug 3, 2012
7505283
add use multi column
PushOk Aug 17, 2012
61fffa3
use join dublicate row
PushOk Aug 17, 2012
ef10877
format code
PushOk Aug 17, 2012
6ecca40
add hidden changes
PushOk Aug 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions ETaggableBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,15 @@ public function getAllTagsWithModelsCount($criteria = null) {

if($this->tagTableCount !== null){
$tagsCriteria->select = sprintf(
"t.%s as `name`, %s as `count`",
"distinct(t.%s) as `name`,%s as `count`",
$this->tagTableName,
$this->tagTableCount
);
$tagsCriteria->join = sprintf(
"JOIN `%s` et ON t.{$this->tagTablePk} = et.%s",
$this->getTagBindingTableName(),
$this->tagBindingTableTagId
);
}
else{
$tagsCriteria->select = sprintf(
Expand All @@ -577,6 +582,7 @@ public function getAllTagsWithModelsCount($criteria = null) {
if($criteria!==null)
$tagsCriteria->mergeWith($criteria);


if($this->getScopeCriteria())
$tagsCriteria->mergeWith($this->getScopeCriteria());

Expand Down Expand Up @@ -616,13 +622,14 @@ public function hasTag($tags) {
* @return CActiveRecord
*/
public function taggedWith($tags) {
$tags = $this->toTagsArray($tags);

if(!empty($tags)){
$criteria = $this->getFindByTagsCriteria($tags);
$this->getOwner()->getDbCriteria()->mergeWith($criteria);
}

if (!empty($tags))
{
$tags = $this->toTagsArray($tags);
if(!empty($tags)){
$criteria = $this->getFindByTagsCriteria($tags);
$this->getOwner()->getDbCriteria()->mergeWith($criteria);
}
}
return $this->getOwner();
}
/**
Expand Down