Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Dec 2016 13:00:42 +0000 (14:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Dec 2016 13:00:42 +0000 (14:00 +0100)
Change-Id: I4017e78c3d4d0e7240e753fe8a59a944bf854d0d

1  2 
tine20/Calendar/js/Model.js
tine20/Sales/Setup/setup.xml
tine20/Setup/Backend/Mysql.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -299,4 -127,26 +299,26 @@@ class Tinebase_Setup_Update_Release9 ex
          if (Tinebase_Core::isLogLevel(Zend_Log::INFO)) Tinebase_Core::getLogger()->info(__METHOD__ . '::' . __LINE__
              . ' Set owner for ' . $count . ' containers.');
      }
 -     * update to 9.6
+     /**
 -    public function update_5()
++     * update to 9.10
+      *
+      * change length of groups.description column from varchar(255) to text
+      */
 -        $this->setApplicationVersion('Tinebase', '9.6');
++    public function update_9()
+     {
+         if ($this->getTableVersion('groups') < 6) {
+             $declaration = new Setup_Backend_Schema_Field_Xml(
+                 '<field>
+                     <name>description</name>
+                     <type>text</type>
+                     <notnull>false</notnull>
+                 </field>
+             ');
+             $this->_backend->alterCol('groups', $declaration);
+             $this->setTableVersion('groups', '6');
+         }
++        $this->setApplicationVersion('Tinebase', '9.10');
+     }
  }
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <application>
      <name>Tinebase</name>
-     <version>9.9</version>
 -    <version>9.6</version>
++    <version>9.10</version>
      <tables>
          <table>
              <name>applications</name>