- towards CRM-5546

civicrm · Dec 17, 2009 · 406091d · 406091d
1 parent 8122e88
commit 406091d
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 41 deletions.
diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php
@@ -108,11 +108,6 @@ static function add(&$params, &$ids)
             CRM_Core_DAO::executeQuery( $query );
         }
 
-        require_once 'CRM/Core/OptionGroup.php';
-        if ( in_array($params['name'], CRM_Core_OptionGroup::$_domainIDGroups) ) {
-            $optionGroup->domain_id = CRM_Core_Config::domainID( );
-        }
-
         $optionGroup->id = CRM_Utils_Array::value( 'optionGroup', $ids );
         $optionGroup->save( );
         return $optionGroup;

diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php
@@ -119,6 +119,13 @@ static function add(&$params, &$ids)
             CRM_Core_DAO::executeQuery( $query, $p );
         }
 
+        $groupName = CRM_Core_DAO::getFieldValue( 'CRM_Core_DAO_OptionGroup', 
+                                                  $params['option_group_id'], 'name', 'id' );
+        require_once 'CRM/Core/OptionGroup.php';
+        if ( in_array($groupName, CRM_Core_OptionGroup::$_domainIDGroups) ) {
+            $optionValue->domain_id = CRM_Core_Config::domainID( );
+        }
+
         $optionValue->id = CRM_Utils_Array::value( 'optionValue', $ids );
         $optionValue->save( );
         return $optionValue;

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
@@ -86,7 +86,7 @@ static function &values( $name, $flip = false, $grouping = false,
   AND  g.is_active       = 1 ";
 
         if ( in_array( $name, self::$_domainIDGroups ) ) {
-            $query .= " AND g.domain_id = " . CRM_Core_Config::domainID( );
+            $query .= " AND v.domain_id = " . CRM_Core_Config::domainID( );
         }
 
         if ( $condition ) {

diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php
@@ -394,11 +394,19 @@ static function getValues( $groupParams, &$values, $orderBy = 'weight', $isActiv
         if ( CRM_Utils_Array::value( 'id', $groupParams ) ) {
             $where .= " AND option_group.id = %1";
             $params[1] = array( $groupParams['id'], 'Integer' );
+            $groupName = CRM_Core_DAO::getFieldValue( 'CRM_Core_DAO_OptionGroup', 
+                                                      $params[1], 'name', 'id' );
         }
 
         if ( CRM_Utils_Array::value( 'name', $groupParams ) ) {
             $where .= " AND option_group.name = %2";
             $params[2] = array( $groupParams['name'], 'String' );
+            $groupName = $params[2];
+        }
+
+        require_once 'CRM/Core/OptionGroup.php';
+        if ( in_array($groupName, CRM_Core_OptionGroup::$_domainIDGroups) ) {
+            $where .= " AND option_value.domain_id = " . CRM_Core_Config::domainID( );
         }
 
         $query = $select . $from . $where . $order;

diff --git a/CRM/Price/Page/Set.php b/CRM/Price/Page/Set.php
@@ -259,6 +259,9 @@ function browse($action=null)
                         'CiviContribute' => ts( 'Contribution' ) );
 
         $dao =& new CRM_Price_DAO_Set();
+        if ( defined( 'CIVICRM_EVENT_PRICE_SET_DOMAIN_ID' ) && CIVICRM_EVENT_PRICE_SET_DOMAIN_ID ) {
+            $dao->domain_id = CRM_Core_Config::domainID( );
+        }
         $dao->find();
         while ($dao->fetch()) {
             $priceSet[$dao->id] = array();

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
diff --git a/xml/schema/Core/OptionGroup.xml b/xml/schema/Core/OptionGroup.xml
@@ -16,18 +16,6 @@
        <name>id</name>
        <autoincrement>true</autoincrement>
   </primaryKey>
-  <field>
-      <name>domain_id</name>
-      <type>int unsigned</type>
-      <comment>Which Domain is this option group for</comment>
-      <add>3.1</add>
-  </field>
-  <foreignKey>
-       <name>domain_id</name>
-       <table>civicrm_domain</table>
-       <key>id</key>
-       <add>3.1</add>
-  </foreignKey>
   <field>
        <name>name</name>
        <title>Option Group Name</title>

diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml
@@ -127,6 +127,18 @@
        <key>id</key>
        <add>2.0</add>
   </foreignKey>  
+  <field>
+      <name>domain_id</name>
+      <type>int unsigned</type>
+      <comment>Which Domain is this option value for</comment>
+      <add>3.1</add>
+  </field>
+  <foreignKey>
+       <name>domain_id</name>
+       <table>civicrm_domain</table>
+       <key>id</key>
+       <add>3.1</add>
+  </foreignKey>
   <field>
        <name>visibility_id</name>
        <type>int unsigned</type>