From b9c2234331f008960e9257a347bbe744ac895f09 Mon Sep 17 00:00:00 2001 From: John Maslanik Date: Mon, 14 Dec 2015 15:52:51 +0800 Subject: [PATCH 1/7] Changed name of package to fork name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 222d198..72910c8 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "creocoder/yii2-nested-sets", + "name": "maz0717/yii2-nested-sets", "description": "The nested sets behavior for the Yii framework", "keywords": [ "yii2", From 1361db5d36f5646dba116f852ff7711dfaccd33a Mon Sep 17 00:00:00 2001 From: John Maslanik Date: Mon, 14 Dec 2015 17:31:38 +0800 Subject: [PATCH 2/7] Reverted to the original package name. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 72910c8..222d198 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "maz0717/yii2-nested-sets", + "name": "creocoder/yii2-nested-sets", "description": "The nested sets behavior for the Yii framework", "keywords": [ "yii2", From 5464632228cda6375268a13a1df2dacc0517692b Mon Sep 17 00:00:00 2001 From: maz0717 Date: Mon, 14 Dec 2015 17:42:16 +0800 Subject: [PATCH 3/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 72910c8..222d198 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "maz0717/yii2-nested-sets", + "name": "creocoder/yii2-nested-sets", "description": "The nested sets behavior for the Yii framework", "keywords": [ "yii2", From 98d892e877aa1f917026e1da9f147ed949b25ca6 Mon Sep 17 00:00:00 2001 From: John Maslanik Date: Mon, 14 Dec 2015 19:53:24 +0800 Subject: [PATCH 4/7] Changed moveNodeAsRoot() and moveNode() to public functions so that they can be overloaded. --- src/.NestedSetsBehavior.php.swp | Bin 0 -> 36864 bytes src/NestedSetsBehavior.php | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/.NestedSetsBehavior.php.swp diff --git a/src/.NestedSetsBehavior.php.swp b/src/.NestedSetsBehavior.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..c7661c1534903fb06d4ae2b9f2e96213d2f54095 GIT binary patch literal 36864 zcmeI53zS_|d4NxS5kZ1h(JpN95C&%kGMOZxXh?=kk_n82nK+q1aT3!zch1aQxO4At z&b=WaVSx&@8kLH|LUge}t%8cwT6tB}`Y339qgJrBRj}gQf<@G&^!xWdkG;=5_cbI@ z={<`tcjnH1{`=pL|KEEbCYPTze5QNyvXdO1XFAUGO{KHs$JI+5XD)Z4{Mhu_G=Apb zE1HIKob{{vw+5ac^pkM^yk9=o%U6Q_-G#!+zLFPIys5sxh>hK82%*WseJlyN%;HI_$h+4`wYkVCVUxgg`43Ga4DP*1=t7!Z~`0)j~(VXzk~=pTm&zIe)tv6kw@V+_y_n9+z311dGH9%l&`>t;2O9B*1>9cDm;ku<@@kn zxE`*9t6>xt!S`{td=lOX``|Tj5-fv9akP93?t^RKt?(Au2dm*{wDT9?MtB|ga4tL# zln%H&dmQ<9zB*Yfc?_P6b)x zR{W}bovT#*!eq7L1@0QRR4o>JRg&)U{o$v(*7qt^zvNDq%SA6&ioc%E`MEha=li+c zW-_V2hp|%mrveR9?w#J4moNKMt}1X8z}Mdu0=MK{;Ff)NuDp|?7AkHoa4WN(JMViO zI;jS3P(TQ!8Mi#GzOUr`8L#3><(EZ?t@pj0R5Yi)ZX*S^pcBoha;oI|k3Zf~KU}0! zcU?D>Q&(lS5cCa{FDQ9_-$0PtNgG(gx1`>CicW_3ZWvR_Ok*fHoD!!VB|Go=Q4P%a z`EQ+PCT}BuBfieRSKS534ms>-9I{>-=jH2&c~pCDH7;%iHOdDnU=} z5~Wa@_54C*s+?D``p;teR$J`v7r$yFzIz?7b>&sWoGxi zQdsSD0$Sa4-<61ZNjxY$w{Z;JU6Uw!6QZjb3+8iq z&yB0NO&?vClk2kPmO+48VmNsWW$tXHGQX<7pDLGva@Eg!%gX*tfB4s+f8CZ1eJA#< zFXpI&ikC0X?^gZLT_69{lkas`E?@DY3{i)9mCjQc1>`h?5?3ch;{9#*%lh2_u>4`Z``4n7O-hAZGmxC*=ddGHkY0rvQPAa?xK z@FsX86k#*G42EG4y5JBH`~4Ge2V4nng$-~7+=C7NRk#V(K{tq9z8Dt4A@CTs_YgM>kCoq%9n4BTQR*W0_@7JcNn*8cFS@>>iRi#>_LNMXWIjl`Bz zB~{Pl57LU=18bx(xyaDw=bgD?)iV@PHb!#!S+^(BM9UN=f_CBCcJ_AJFi4UW4REC7 z@*pg-wrh&|ZkX%|i&|Gtg4x1!WfPY8m}S)W=rYGbbyPNn<3g(m;`e5-=(Om=K$vc7 zYbO4qs=oSTh6aU&4mTad{gEh9R3XFVr~~MnD3h&!VfearQUYZcs_MBXxGR>reJjoF z50YzBgHxI&3CI%`BkgZ#QN?xJ+mSQ0y>CTtudV1h^Ei83ds^;cS*o{?>@AgUGj}U) z%b8C&kp$#3(w!#VzFEhKk_?k;d3`dzYLxXzhHm; zzu`-8C7c6Y@LV_y4uuc1&wdkp0NxF+g>zvNUIhJcD13_j_6uPJ{E+?izlFOA4D5Xa&ErHX z8p*Qm`bW~$?psH~$)nxc$?R7@zx0qwwbfTqz4dQN<@N9J5>T?pT$5xD*y&_+Cb3i+ z^z2kIjf9LQYbBx75Md;gw00}$*h7JlOtZ0bk0T9~J{=+_C`M2UbBV#mM7@=0yoykA zQ7J0#aQjP)mX`%aZ$L*3srR`n%mqVg8CYu#M9aGjLxYvMQi+U6jc10WI2o&t#)E#` z>=`jLjFSm1Y-vNDj5uKr�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 literal 0 HcmV?d00001 diff --git a/src/NestedSetsBehavior.php b/src/NestedSetsBehavior.php index db1569e..6eb35f5 100644 --- a/src/NestedSetsBehavior.php +++ b/src/NestedSetsBehavior.php @@ -490,7 +490,7 @@ class NestedSetsBehavior extends Behavior /** * @return void */ - protected function moveNodeAsRoot() + public function moveNodeAsRoot() { $db = $this->owner->getDb(); $leftValue = $this->owner->getAttribute($this->leftAttribute); @@ -523,7 +523,7 @@ class NestedSetsBehavior extends Behavior * @param integer $value * @param integer $depth */ - protected function moveNode($value, $depth) + public function moveNode($value, $depth) { $db = $this->owner->getDb(); $leftValue = $this->owner->getAttribute($this->leftAttribute); From 7cb22247b4e7cb05533f9378a824cb6f95d425c9 Mon Sep 17 00:00:00 2001 From: John Maslanik Date: Thu, 21 Jan 2016 12:27:53 +0800 Subject: [PATCH 5/7] Made applyTreeAttributeCondition function a public function. --- src/.NestedSetsBehavior.php.swp | Bin 36864 -> 0 bytes src/NestedSetsBehavior.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/.NestedSetsBehavior.php.swp diff --git a/src/.NestedSetsBehavior.php.swp b/src/.NestedSetsBehavior.php.swp deleted file mode 100644 index c7661c1534903fb06d4ae2b9f2e96213d2f54095..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36864 zcmeI53zS_|d4NxS5kZ1h(JpN95C&%kGMOZxXh?=kk_n82nK+q1aT3!zch1aQxO4At z&b=WaVSx&@8kLH|LUge}t%8cwT6tB}`Y339qgJrBRj}gQf<@G&^!xWdkG;=5_cbI@ z={<`tcjnH1{`=pL|KEEbCYPTze5QNyvXdO1XFAUGO{KHs$JI+5XD)Z4{Mhu_G=Apb zE1HIKob{{vw+5ac^pkM^yk9=o%U6Q_-G#!+zLFPIys5sxh>hK82%*WseJlyN%;HI_$h+4`wYkVCVUxgg`43Ga4DP*1=t7!Z~`0)j~(VXzk~=pTm&zIe)tv6kw@V+_y_n9+z311dGH9%l&`>t;2O9B*1>9cDm;ku<@@kn zxE`*9t6>xt!S`{td=lOX``|Tj5-fv9akP93?t^RKt?(Au2dm*{wDT9?MtB|ga4tL# zln%H&dmQ<9zB*Yfc?_P6b)x zR{W}bovT#*!eq7L1@0QRR4o>JRg&)U{o$v(*7qt^zvNDq%SA6&ioc%E`MEha=li+c zW-_V2hp|%mrveR9?w#J4moNKMt}1X8z}Mdu0=MK{;Ff)NuDp|?7AkHoa4WN(JMViO zI;jS3P(TQ!8Mi#GzOUr`8L#3><(EZ?t@pj0R5Yi)ZX*S^pcBoha;oI|k3Zf~KU}0! zcU?D>Q&(lS5cCa{FDQ9_-$0PtNgG(gx1`>CicW_3ZWvR_Ok*fHoD!!VB|Go=Q4P%a z`EQ+PCT}BuBfieRSKS534ms>-9I{>-=jH2&c~pCDH7;%iHOdDnU=} z5~Wa@_54C*s+?D``p;teR$J`v7r$yFzIz?7b>&sWoGxi zQdsSD0$Sa4-<61ZNjxY$w{Z;JU6Uw!6QZjb3+8iq z&yB0NO&?vClk2kPmO+48VmNsWW$tXHGQX<7pDLGva@Eg!%gX*tfB4s+f8CZ1eJA#< zFXpI&ikC0X?^gZLT_69{lkas`E?@DY3{i)9mCjQc1>`h?5?3ch;{9#*%lh2_u>4`Z``4n7O-hAZGmxC*=ddGHkY0rvQPAa?xK z@FsX86k#*G42EG4y5JBH`~4Ge2V4nng$-~7+=C7NRk#V(K{tq9z8Dt4A@CTs_YgM>kCoq%9n4BTQR*W0_@7JcNn*8cFS@>>iRi#>_LNMXWIjl`Bz zB~{Pl57LU=18bx(xyaDw=bgD?)iV@PHb!#!S+^(BM9UN=f_CBCcJ_AJFi4UW4REC7 z@*pg-wrh&|ZkX%|i&|Gtg4x1!WfPY8m}S)W=rYGbbyPNn<3g(m;`e5-=(Om=K$vc7 zYbO4qs=oSTh6aU&4mTad{gEh9R3XFVr~~MnD3h&!VfearQUYZcs_MBXxGR>reJjoF z50YzBgHxI&3CI%`BkgZ#QN?xJ+mSQ0y>CTtudV1h^Ei83ds^;cS*o{?>@AgUGj}U) z%b8C&kp$#3(w!#VzFEhKk_?k;d3`dzYLxXzhHm; zzu`-8C7c6Y@LV_y4uuc1&wdkp0NxF+g>zvNUIhJcD13_j_6uPJ{E+?izlFOA4D5Xa&ErHX z8p*Qm`bW~$?psH~$)nxc$?R7@zx0qwwbfTqz4dQN<@N9J5>T?pT$5xD*y&_+Cb3i+ z^z2kIjf9LQYbBx75Md;gw00}$*h7JlOtZ0bk0T9~J{=+_C`M2UbBV#mM7@=0yoykA zQ7J0#aQjP)mX`%aZ$L*3srR`n%mqVg8CYu#M9aGjLxYvMQi+U6jc10WI2o&t#)E#` z>=`jLjFSm1Y-vNDj5uKr�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 diff --git a/src/NestedSetsBehavior.php b/src/NestedSetsBehavior.php index 6eb35f5..b5355cc 100644 --- a/src/NestedSetsBehavior.php +++ b/src/NestedSetsBehavior.php @@ -669,7 +669,7 @@ class NestedSetsBehavior extends Behavior /** * @param array $condition */ - protected function applyTreeAttributeCondition(&$condition) + public function applyTreeAttributeCondition(&$condition) { if ($this->treeAttribute !== false) { $condition = [ From b33050ba8e6dee0a45d93331fe7a0707e2c35af9 Mon Sep 17 00:00:00 2001 From: John Maslanik Date: Thu, 21 Jan 2016 13:53:01 +0800 Subject: [PATCH 6/7] Reverted last change. Added subtree function. --- src/NestedSetsBehavior.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/NestedSetsBehavior.php b/src/NestedSetsBehavior.php index b5355cc..5ba5bc4 100644 --- a/src/NestedSetsBehavior.php +++ b/src/NestedSetsBehavior.php @@ -247,6 +247,24 @@ class NestedSetsBehavior extends Behavior return $this->owner->find()->andWhere($condition)->addOrderBy([$this->leftAttribute => SORT_ASC]); } + public function children($depth = null) + { + $condition = [ + 'and', + ['>=', $this->leftAttribute, $this->owner->getAttribute($this->leftAttribute)], + ['<=', $this->rightAttribute, $this->owner->getAttribute($this->rightAttribute)], + ]; + + if ($depth !== null) { + $condition[] = ['<=', $this->depthAttribute, $this->owner->getAttribute($this->depthAttribute) + $depth]; + } + + $this->applyTreeAttributeCondition($condition); + + return $this->owner->find()->andWhere($condition)->addOrderBy([$this->leftAttribute => SORT_ASC]); + } + + /** * Gets the leaves of the node. * @return \yii\db\ActiveQuery @@ -669,7 +687,7 @@ class NestedSetsBehavior extends Behavior /** * @param array $condition */ - public function applyTreeAttributeCondition(&$condition) + protected function applyTreeAttributeCondition(&$condition) { if ($this->treeAttribute !== false) { $condition = [ From b22faa8f96f4bfca702d29dd2d4e818c7ac11372 Mon Sep 17 00:00:00 2001 From: John Maslanik Date: Thu, 21 Jan 2016 14:00:40 +0800 Subject: [PATCH 7/7] Forgot to rename subtree function. --- src/NestedSetsBehavior.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NestedSetsBehavior.php b/src/NestedSetsBehavior.php index 5ba5bc4..4ac2801 100644 --- a/src/NestedSetsBehavior.php +++ b/src/NestedSetsBehavior.php @@ -247,7 +247,7 @@ class NestedSetsBehavior extends Behavior return $this->owner->find()->andWhere($condition)->addOrderBy([$this->leftAttribute => SORT_ASC]); } - public function children($depth = null) + public function subtree($depth = null) { $condition = [ 'and',