wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3430 from owncloud/vcategory_rename

Browse source 
Add rename() method to OC_VCategories.
This commit is contained in:
Thomas Müller 2013-05-20 08:08:15 -07:00
commit 54d3b381a8
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/vcategories.php
View file

@ -324,6 +324,37 @@ class OC_VCategories {
return $id;
}
/**
* @brief Rename category.
* @param string $from The name of the existing category
* @param string $to The new name of the category.
* @returns bool
*/
public function rename($from, $to) {
$id = $this->array_searchi($from, $this->categories);
if($id === false) {
OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG);
return false;
}
$sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? '
. 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
try {
$stmt = OCP\DB::prepare($sql);
$result = $stmt->execute(array($to, $this->user, $this->type, $id));
if (OC_DB::isError($result)) {
OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
return false;
}
} catch(Exception $e) {
OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
OCP\Util::ERROR);
return false;
}
$this->categories[$id] = $to;
return true;
}
/**
* @brief Add a new category.
* @param $names A string with a name or an array of strings containing

11
tests/lib/vcategories.php
View file

@ -81,6 +81,17 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
}
public function testrenameCategory() {
$defcategories = array('Friends', 'Family', 'Wrok', 'Other');
$catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
$this->assertTrue($catmgr->rename('Wrok', 'Work'));
$this->assertTrue($catmgr->hasCategory('Work'));
$this->assertFalse($catmgr->hasCategory('Wrok'));
$this->assertFalse($catmgr->rename('Wrok', 'Work'));
}
public function testAddToCategory() {
$objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);