Merge pull request #69 from okinaka/saving-with-identifier

Saving with identifier
CakeDC · Apr 21, 2014 · a806609 · a806609
2 parents 2bba473 + b378ddd
commit a806609
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/Model/Behavior/TaggableBehavior.php b/Model/Behavior/TaggableBehavior.php
@@ -167,10 +167,15 @@ public function saveTags(Model $model, $string = null, $foreignKey = null, $upda
 			extract($this->disassembleTags($model, $string, $this->settings[$model->alias]['separator']));
 
 			if (!empty($tags)) {
+				$conditions = array('OR' => array_map(function ($tag) use ($tagModel) {
+					return array(
+						$tagModel->alias . '.identifier' => $tag['identifier'],
+						$tagModel->alias . '.keyname' => $tag['keyname'],
+					);
+				}, $tags));
 				$existingTags = $tagModel->find('all', array(
 					'contain' => array(),
-					'conditions' => array(
-						$tagModel->alias . '.keyname' => Set::extract($tags, '{n}.keyname')),
+					'conditions' => $conditions,
 					'fields' => array(
 						$tagModel->alias . '.identifier',
 						$tagModel->alias . '.keyname',

diff --git a/Test/Case/Model/Behavior/TaggableBehaviorTest.php b/Test/Case/Model/Behavior/TaggableBehaviorTest.php
@@ -236,7 +236,7 @@ public function testTagArrayToString() {
 		$this->assertTrue(empty($result));
 		$this->assertInternalType('string', $result);
 
-		$data['tags'] = 'cakephp:foo, cakephp:bar';
+		$data['tags'] = 'cakephp:foo, cakephp:bar, foo, bar';
 		$this->Article->save($data, false);
 		$result = $this->Article->find('first', array(
 			'conditions' => array(
@@ -373,4 +373,17 @@ public function testSavingTagsDoesNotCreateEmptyRecords() {
 		$this->assertEquals($count, 0);
 	}
 
+/**
+ * testSavingTagsWithDefferentIdentifier
+ *
+ * @return void
+ */
+	public function testSavingTagsWithDifferentIdentifier() {
+		$data = $this->Article->findById('article-1');
+		$data['Article']['tags'] = 'foo:cakephp, bar:cakephp';
+		$this->Article->save($data);
+		$data = $this->Article->findById('article-1');
+		$this->assertEquals('bar:cakephp, foo:cakephp', $data['Article']['tags']);
+
+	}
 }