Allowing to add existing tags.

CakeDC · Apr 16, 2014 · dd74851 · dd74851
1 parent 2bba473
commit dd74851
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/Model/Behavior/TaggableBehavior.php b/Model/Behavior/TaggableBehavior.php
@@ -414,6 +414,11 @@ public function deleteTagged(Model $model) {
  */
 	public function afterFind(Model $model, $results, $primary = false) {
 		extract($this->settings[$model->alias]);
+
+		if ($model->alias === $tagAlias) {
+			return $results;
+		}
+
 		foreach ($results as $key => $row) {
 			$row[$model->alias][$field] = '';
 			if (isset($row[$tagAlias]) && !empty($row[$tagAlias])) {

diff --git a/Test/Case/Controller/TagsControllerTest.php b/Test/Case/Controller/TagsControllerTest.php
@@ -194,6 +194,13 @@ public function testAdminAdd() {
 				'tags' => 'tag1, tag2, tag3'));
 		$this->Tags->admin_add();
 		$this->assertEquals($this->Tags->redirectUrl, array('action' => 'index'));
+
+		// adding same tags again.
+		$this->Tags->data = array(
+			'Tag' => array(
+				'tags' => 'tag1, tag2, tag3'));
+		$this->Tags->admin_add();
+		$this->assertEquals($this->Tags->redirectUrl, array('action' => 'index'));
 	}
 
 /**

diff --git a/Test/Case/Model/TagTest.php b/Test/Case/Model/TagTest.php
@@ -119,6 +119,12 @@ public function testAdd() {
 		$this->assertTrue(in_array('tag1', $result));
 		$this->assertTrue(in_array('tag2', $result));
 		$this->assertTrue(in_array('tag3', $result));
+
+		// adding same tags again.
+		$result = $this->Tag->add(
+			array('Tag' => array(
+				'tags' => 'tag1, tag2, tag3')));
+		$this->assertTrue($result);
 	}
 
 /**