aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio <s1lv10@uol.com.br>2010-09-16 11:10:54 -0300
committerSilvio <s1lv10@uol.com.br>2010-09-16 11:10:54 -0300
commit63d9e8c6458d337e8f15db8e51fb0e54c6333d45 (patch)
treecacd5cb9b15025ae59a58055414be72cad020609
parentfb7d16422c117cd45843f7df935c1744a618ac5d (diff)
downloadsf_isis_importer_plugin-63d9e8c6458d337e8f15db8e51fb0e54c6333d45.tar.gz
sf_isis_importer_plugin-63d9e8c6458d337e8f15db8e51fb0e54c6333d45.tar.bz2
Minor changes due to cinisis updates
-rw-r--r--lib/sfIsisImporter.class.php29
1 files changed, 13 insertions, 16 deletions
diff --git a/lib/sfIsisImporter.class.php b/lib/sfIsisImporter.class.php
index 5ab3260..6ab526d 100644
--- a/lib/sfIsisImporter.class.php
+++ b/lib/sfIsisImporter.class.php
@@ -199,33 +199,30 @@ class sfIsisImporter extends sfIsisImporterRelations
* @param string $model Model name
* @param array $field Field data from ISIS database schema
* @return boolean True if has a denied combination, false otherwise
- * @todo Wildcard
+ * @todo Wildcard support
* @todo Test
*/
public function hasDeniedCombinations($model, $field)
{
- if (method_exists($this, 'getDeniedCombinations'))
+ foreach ($this->isis->getDeniedCombinations($field) as $combination)
{
- foreach ($this->getDeniedCombinations($model, $field) as $combination)
- {
- $has = true;
+ $has = true;
- foreach ($combination as $item)
+ foreach ($combination as $item)
+ {
+ foreach (new IsisRowIterator($this->isis, $field) as $row)
{
- foreach (new IsisRowIterator($this->isis, $field) as $row)
+ if (!$this->hasDeniedItem($field, $item, $row))
{
- if (!$this->hasDeniedItem($field, $item, $row))
- {
- $has = false;
- break 2;
- }
+ $has = false;
+ break 2;
}
}
+ }
- if ($has)
- {
- $denied[$row] = $combination;
- }
+ if ($has)
+ {
+ $denied[$row] = $combination;
}
}