[Gemstracker-svn] SF.net SVN: gemstracker:[368] trunk/library

[<gem...@li...>]

Revision: 368
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=368&view=rev
Author:   mennodekker
Date:     2011-12-16 15:23:24 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Forgot check for compatibility with definitions that are not configurable :)

Modified Paths:
--------------
    trunk/library/classes/Gems/Model/OrganizationModel.php
    trunk/library/snippets/Organization/OrganizationEditSnippet.php

Modified: trunk/library/classes/Gems/Model/OrganizationModel.php
===================================================================
--- trunk/library/classes/Gems/Model/OrganizationModel.php	2011-12-16 15:06:43 UTC (rev 367)
+++ trunk/library/classes/Gems/Model/OrganizationModel.php	2011-12-16 15:23:24 UTC (rev 368)
@@ -131,7 +131,7 @@
             $class      = $newValues['gor_user_class'] . 'Definition';
             $definition = $this->loader->getUserLoader()->getUserDefinition($class);
 
-            if ($definition->hasConfig()) {
+            if ($definition instanceof Gems_User_UserDefinitionConfigurableInterface && $definition->hasConfig()) {
                 $savedValues['config'] = $definition->saveConfig($savedValues,$newValues['config']);
                 if ($definition->getConfigChanged()>0 && $this->getChanged()<1) {
                     $this->setChanged(1);
@@ -150,7 +150,7 @@
             $class      = $data['gor_user_class'] . 'Definition';
             $definition = $this->loader->getUserLoader()->getUserDefinition($class);
 
-            if ($definition->hasConfig()) {
+            if ($definition instanceof Gems_User_UserDefinitionConfigurableInterface && $definition->hasConfig()) {
                 $data['config'] = $definition->loadConfig($data);
             }
         }

Modified: trunk/library/snippets/Organization/OrganizationEditSnippet.php
===================================================================
--- trunk/library/snippets/Organization/OrganizationEditSnippet.php	2011-12-16 15:06:43 UTC (rev 367)
+++ trunk/library/snippets/Organization/OrganizationEditSnippet.php	2011-12-16 15:23:24 UTC (rev 368)
@@ -93,7 +93,7 @@
             $class      = $this->formData['gor_user_class'] . 'Definition';
             $definition = $this->loader->getUserLoader()->getUserDefinition($class);
 
-            if ($definition->hasConfig()) {
+            if ($definition instanceof Gems_User_UserDefinitionConfigurableInterface && $definition->hasConfig()) {
                 $definition->appendConfigFields($bridge);
             }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.