Merge branch '2014.11' into 2014.11-develop
[tine20] / tine20 / Calendar / Setup / Update / Release8.php
index c392e43..ff0e3b0 100644 (file)
@@ -452,10 +452,56 @@ class Calendar_Setup_Update_Release8 extends Setup_Update_Abstract
     }
 
     /**
-     * force activesync calendar resync for iOS devices
+     * 
      */
     public function update_10()
     {
+        $declaration = new Setup_Backend_Schema_Field_Xml('
+            <field>
+                <name>status</name>
+                <type>text</type>
+                <length>32</length>
+                <default>NEEDS-ACTION</default>
+                <notnull>true</notnull>
+            </field>');
+        $this->_backend->addCol('cal_resources', $declaration);
+
+        $declaration = new Setup_Backend_Schema_Index_Xml('
+            <index>
+                <name>status</name>
+                <field>
+                    <name>status</name>
+                </field>
+            </index>');
+        $this->_backend->addIndex('cal_resources', $declaration);
+
+        $declaration = new Setup_Backend_Schema_Field_Xml('
+            <field>
+                <name>suppress_notification</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>');
+        $this->_backend->addCol('cal_resources', $declaration);
+
+        $declaration = new Setup_Backend_Schema_Index_Xml('
+            <index>
+                <name>suppress_notification</name>
+                <field>
+                    <name>suppress_notification</name>
+                </field>
+            </index>');
+        $this->_backend->addIndex('cal_resources', $declaration);
+
+        $this->setTableVersion('cal_resources', '3');
+
+        $this->setApplicationVersion('Calendar', '8.11');
+    }
+
+    /**
+     * force activesync calendar resync for iOS devices
+     */
+    public function update_11()
+    {
         if (Tinebase_Application::getInstance()->isInstalled('ActiveSync')) {
             $deviceBackend = new ActiveSync_Backend_Device();
             $usersWithiPhones = $deviceBackend->search(new ActiveSync_Model_DeviceFilter(array(
@@ -472,6 +518,6 @@ class Calendar_Setup_Update_Release8 extends Setup_Update_Abstract
             }
         }
 
-        $this->setApplicationVersion('Calendar', '8.11');
+        $this->setApplicationVersion('Calendar', '8.12');
     }
 }