Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Sep 2015 10:37:18 +0000 (12:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Sep 2015 10:37:18 +0000 (12:37 +0200)
Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml

Change-Id: I53d895d8432d24672f7c11b2fd53239c4e1fb3d0

1  2 
tine20/Calendar/Controller/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/Update/Release9.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/js/ResourceEditDialog.js
tine20/Calendar/translations/de.po
tine20/Crm/Setup/Update/Release8.php
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/Frontend/Http.php

Simple merge
@@@ -450,12 -450,49 +450,57 @@@ class Calendar_Setup_Update_Release8 ex
          $this->setTableVersion('cal_events', 11);
          $this->setApplicationVersion('Calendar', '8.10');
      }
 -    
 +
      /**
-      * update to 9.0
 -     * 
++     * @see 0011312: Make resource notification handling and default status configurable
       */
      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');
+     }
++
++    /**
++     * update to 9.0
++     */
++    public function update_11()
++    {
 +        $this->setApplicationVersion('Calendar', '9.0');
 +    }
  }
index e51e71a,0000000..4ef5b79
mode 100644,000000..100644
--- /dev/null
@@@ -1,39 -1,0 +1,53 @@@
 +<?php
 +/**
 + * Tine 2.0
 + *
 + * @package     Calendar
 + * @subpackage  Setup
 + * @license     http://www.gnu.org/licenses/agpl.html AGPL3
 + * @copyright   Copyright (c) 2015 Metaways Infosystems GmbH (http://www.metaways.de)
 + * @author      Philipp Schüle <p.schuele@metaways.de>
 + */
 +class Calendar_Setup_Update_Release9 extends Setup_Update_Abstract
 +{
 +    /**
 +     * update to 9.1
 +     * - identify base event via new base_event_id field instead of UID
 +     */
 +    public function update_0()
 +    {
 +        if ($this->getTableVersion('cal_events') < 10) {
 +            $release8 = new Calendar_Setup_Update_Release8($this->_backend);
 +            $release8->update_8();
 +        }
 +        $this->setApplicationVersion('Calendar', '9.1');
 +    }
 +
 +    /**
 +     * update to 9.2
 +     *
 +     * @see 0011266: increase size of event fields summary and location
 +     */
 +    public function update_1()
 +    {
 +        if ($this->getTableVersion('cal_events') < 11) {
 +            $release8 = new Calendar_Setup_Update_Release8($this->_backend);
 +            $release8->update_9();
 +        }
 +        $this->setApplicationVersion('Calendar', '9.2');
 +    }
++
++    /**
++     * update to 9.3
++     *
++     * @see 0011312: Make resource notification handling and default status configurable
++     */
++    public function update_2()
++    {
++        if ($this->getTableVersion('cal_resources') < 3) {
++            $release8 = new Calendar_Setup_Update_Release8($this->_backend);
++            $release8->update_10();
++        }
++        $this->setApplicationVersion('Calendar', '9.3');
++    }
 +}
@@@ -2,7 -2,7 +2,7 @@@
  <application>
      <name>Calendar</name>
      <!-- gettext('Calendar') -->   
-     <version>9.2</version>
 -    <version>8.11</version>
++    <version>9.3</version>
      <order>15</order>
      <status>enabled</status>
      <tables>
Simple merge
Simple merge
Simple merge