hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

complete admin controller tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-27 17:16:50 +01:00
parent 7099059f0b
commit 694f943d23
9 changed files with 669 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/classes/databox/subdefsStructure.class.php
View File

@@ -65,7 +65,6 @@ class databox_subdefsStructure implements IteratorAggregate
);
if (!$sx_struct)
return $this;
$subdefgroup = $sx_struct->subdefs[0];
@@ -129,8 +128,9 @@ class databox_subdefsStructure implements IteratorAggregate
public function get_subdef($subdef_type, $subdef_name)
{
if (isset($this->AvSubdefs[$subdef_type]) && isset($this->AvSubdefs[$subdef_type][$subdef_name]))
{
return $this->AvSubdefs[$subdef_type][$subdef_name];
}
throw new Exception_Databox_SubdefNotFound();
}
@@ -146,9 +146,9 @@ class databox_subdefsStructure implements IteratorAggregate
$dom_struct = $this->databox->get_dom_structure();
$dom_xp = $this->databox->get_xpath_structure();
$nodes = $dom_xp->query(
'//record/subdefs/'
. 'subdefgroup[@name="' . $group . '"]/'
. 'subdef[@name="' . $name . '"]'
'//record/subdefs/'
. 'subdefgroup[@name="' . $group . '"]/'
. 'subdef[@name="' . $name . '"]'
);
if ($nodes->length > 0)
@@ -173,7 +173,7 @@ class databox_subdefsStructure implements IteratorAggregate
* @param string $class
* @return databox_subdefsStructure
*/
public function add_subdef($group, $name, $class)
public function add_subdef($groupname, $name, $class)
{
$dom_struct = $this->databox->get_dom_structure();
@@ -182,13 +182,13 @@ class databox_subdefsStructure implements IteratorAggregate
$subdef->setAttribute('name', $name);
$dom_xp = $this->databox->get_xpath_structure();
$query = '//record/subdefs/subdefgroup[@name="' . $group . '"]';
$query = '//record/subdefs/subdefgroup[@name="' . $groupname . '"]';
$groups = $dom_xp->query($query);
if ($groups->length == 0)
{
$group = $dom_struct->createElement('subdefgroup');
$group->setAttribute('name', $group);
$group->setAttribute('name', $groupname);
$dom_xp->query('/record/subdefs')->item(0)->appendChild($group);
}
else
@@ -233,7 +233,7 @@ class databox_subdefsStructure implements IteratorAggregate
$dom_xp = $this->databox->get_xpath_structure();
$nodes = $dom_xp->query('//record/subdefs/'
. 'subdefgroup[@name="' . $group . '"]');
. 'subdefgroup[@name="' . $group . '"]');
if ($nodes->length > 0)
{
$dom_group = $nodes->item(0);
@@ -255,9 +255,9 @@ class databox_subdefsStructure implements IteratorAggregate
}
$nodes = $dom_xp->query(
'//record/subdefs/'
. 'subdefgroup[@name="' . $group . '"]/'
. 'subdef[@name="' . $name . '"]'
'//record/subdefs/'
. 'subdefgroup[@name="' . $group . '"]/'
. 'subdef[@name="' . $name . '"]'
);
if ($nodes->length > 0)