Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Jul 2015 11:11:37 +0000 (13:11 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Jul 2015 11:11:37 +0000 (13:11 +0200)
Conflicts:
tine20/Calendar/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml

Change-Id: I85f41a45a0908c6f0172ab578f42d68cbb049e80

1  2 
tine20/Calendar/Config.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml

@@@ -312,9 -301,8 +312,9 @@@ class Calendar_Config extends Tinebase_
                  ),
              ),
              'default'               => array(
-                 self::FEATURE_SPLIT_VIEW           => true,
-                 self::FEATURE_YEAR_VIEW            => true,
-                 self::FEATURE_EXTENDED_EVENT_CONTEXT_ACTIONS    => false,
+                 self::FEATURE_SPLIT_VIEW                        => false,
 -                self::FEATURE_EXTENDED_EVENT_CONTEXT_ACTIONS    => false,
++                self::FEATURE_YEAR_VIEW                         => true,
++                self::FEATURE_EXTENDED_EVENT_CONTEXT_ACTIONS    => true,
              ),
          ),
      );
@@@ -769,11 -787,14 +778,14 @@@ class Tinebase_Container extends Tineba
          $accountId   = Tinebase_Model_User::convertUserIdToInt($_accountId);
          $grant       = $_ignoreACL ? '*' : $_grant;
          
-         $classCacheId = $accountId .
-                         $application->getId() .
-                         implode('', (array)$grant) .
-                         (int)$_ignoreACL;
-         
+         $classCacheId = Tinebase_Helper::convertCacheId(
+             $accountId .
+             $application->getId() .
+             implode('', (array)$grant) .
+             (int)$_ignoreACL .
+             (int)$_andGrants
+         );
 -        
++
          try {
              return $this->loadFromClassCache(__FUNCTION__, $classCacheId);
          } catch (Tinebase_Exception_NotFound $tenf) {
          $application = Tinebase_Application::getInstance()->getApplicationByName($_application);
          $grant       = $_ignoreACL ? '*' : $_grant;
  
-         $classCacheId = $accountId . $application->getId() . implode('', (array)$grant) .(int)$_ignoreACL;
+         $classCacheId = Tinebase_Helper::convertCacheId($accountId . $application->getId() . implode('', (array)$grant) . (int)$_ignoreACL . (int)$_andGrants);
++
          try {
              return $this->loadFromClassCache(__FUNCTION__, $classCacheId);
          } catch (Tinebase_Exception_NotFound $tenf) {
Simple merge
@@@ -524,14 -524,20 +524,32 @@@ class Tinebase_Setup_Update_Release8 ex
          
          $this->setApplicationVersion('Tinebase', '8.11');
      }
-     
+     /**
+      * update 11
+      *
+      * @see 0011178: allow to lock preferences for individual users
+      */
+     public function update_11()
+     {
 -        $declaration = new Setup_Backend_Schema_Field_Xml('<field>
 -                    <name>locked</name>
 -                    <type>boolean</type>
 -                </field>');
 -        $this->_backend->addCol('preferences', $declaration);
 -        $this->setTableVersion('preferences', '8');
++        if ($this->getTableVersion('preferences') != 8) {
++            $declaration = new Setup_Backend_Schema_Field_Xml('<field>
++                        <name>locked</name>
++                        <type>boolean</type>
++                    </field>');
++            $this->_backend->addCol('preferences', $declaration);
++            $this->setTableVersion('preferences', '8');
++        }
+         $this->setApplicationVersion('Tinebase', '8.12');
+     }
++
 +    /**
 +     * update to 9.0
 +     *
 +     * @return void
 +     */
-     public function update_11()
++    public function update_12()
 +    {
 +        $this->setApplicationVersion('Tinebase', '9.0');
 +    }
  }
index 0000000,0000000..78899bc
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,24 @@@
++<?php
++/**
++ * Tine 2.0
++ *
++ * @package     Tinebase
++ * @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 Tinebase_Setup_Update_Release9 extends Setup_Update_Abstract
++{
++    /**
++     * update to 9.1
++     * 
++     * @see 0011178: allow to lock preferences for individual users
++     */
++    public function update_0()
++    {
++        $update8 = new Tinebase_Setup_Update_Release8($this->_backend);
++        $update8->update_11();
++        $this->setApplicationVersion('Tinebase', '9.1');
++    }
++}
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <application>
      <name>Tinebase</name>
-     <version>9.0</version>
 -    <version>8.12</version>
++    <version>9.1</version>
      <tables>
          <table>
              <name>applications</name>