Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jun 2014 11:57:47 +0000 (13:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jun 2014 11:57:47 +0000 (13:57 +0200)
Conflicts:
tests/tine20/Calendar/TestCase.php
tine20/Calendar/css/print.css

Change-Id: Ia6b5b97638b7afd5c669d265ceca7b634809bc5e

1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Controller/ResourceTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/css/print.css
tine20/Tinebase/Acl/Roles.php
tine20/Tinebase/Controller/Abstract.php
tine20/Tinebase/Core.php
tine20/Tinebase/Record/Abstract.php

@@@ -295,25 -183,41 +295,41 @@@ abstract class Calendar_TestCase extend
      protected function _getAttendee()
      {
          return new Tinebase_Record_RecordSet('Calendar_Model_Attender', array(
-             array(
-                 'user_id'        => $this->_getTestUserContact()->getId(),
-                 'user_type'      => Calendar_Model_Attender::USERTYPE_USER,
-                 'role'           => Calendar_Model_Attender::ROLE_REQUIRED,
-                 'status_authkey' => Tinebase_Record_Abstract::generateUID(),
-             ),
-             array(
-                 'user_id'        => $this->_GetPersonasContacts('sclever')->getId(),
-                 'user_type'      => Calendar_Model_Attender::USERTYPE_USER,
-                 'role'           => Calendar_Model_Attender::ROLE_REQUIRED,
-                 'status_authkey' => Tinebase_Record_Abstract::generateUID(),
-             ),
-             /* no group suppoert yet
-             array(
-                 'user_id'        => Tinebase_Core::getUser()->accountPrimaryGroup,
-                 'user_type'      => Calendar_Model_Attender::USERTYPE_GROUP,
-                 'status_authkey' => Tinebase_Record_Abstract::generateUID(),
-             )
-             */
 -            $this->_createAttender($this->_testUserContact->getId())->toArray(),
 -            $this->_createAttender($this->_personasContacts['sclever']->getId())->toArray(),
++            $this->_createAttender($this->_getTestUserContact()->getId())->toArray(),
++            $this->_createAttender($this->_GetPersonasContacts('sclever')->getId())->toArray(),
+         ));
+     }
+     
+     /**
+      * create new attender
+      *
+      * @param string $userId
+      * @param string $type
+      * @return Calendar_Model_Attender
+      */
+     protected function _createAttender($userId, $type = Calendar_Model_Attender::USERTYPE_USER)
+     {
+         return new Calendar_Model_Attender(array(
+             'user_id'        => $userId,
+             'user_type'      => $type,
+             'role'           => Calendar_Model_Attender::ROLE_REQUIRED,
+             'status_authkey' => Tinebase_Record_Abstract::generateUID(),
+         ));
+     }
+     
+     /**
+      * get resource
+      * 
+      * @return Calendar_Model_Resource
+      */
+     protected function _getResource()
+     {
+         return new Calendar_Model_Resource(array(
+             'name'                 => 'Meeting Room',
+             'description'          => 'Our main meeting room',
+             'email'                => 'room@example.com',
+             'is_location'          => TRUE,
          ));
      }
      
@@@ -33,10 -33,14 +33,14 @@@ table td 
  }
  
  .cal-print-title {
 -      text-align: center;
 -      font-size: 20px;
 +    text-align: center;
 +    font-size: 20px;
  }
  
+ .cal-print-daysview-day td {
+     vertical-align: top;
+ }
  .cal-print-daysview-day-dayOfMonth {
      font-size: 20px;
      font-weight: bold;
  /* ------------ monthview ------------ */
  .cal-print-monthview-daycell {
      border: 0;
 -      text-align: center;
 -      font-size: 12px;
 -      font-weight: bold;
 -      background-color: #FFFFFF;
 -      padding-top: 20px;
 +    text-align: center;
 +    font-size: 12px;
 +    font-weight: bold;
++    background-color: #FFFFFF;
++    padding-top: 20px;
  }
  
  .cal-print-monthview .cal-print-daycell {
Simple merge
Simple merge
Simple merge