Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 23 Jul 2013 09:34:12 +0000 (11:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 23 Jul 2013 09:34:12 +0000 (11:34 +0200)
Conflicts:
tine20/Voipmanager/Setup/DemoData.php

1  2 
tine20/Admin/Setup/DemoData.php
tine20/Tinebase/Frontend/Cli.php
tine20/Voipmanager/Setup/DemoData.php

Simple merge
Simple merge
@@@ -31,11 -31,11 +31,17 @@@ class Voipmanager_Setup_DemoData extend
      protected $_appName = 'Voipmanager';
      
      /**
 +     * the phone which will be created
       * 
 +     * @var Voipmanager_Model_Snom_Phone
 +     */
 +    protected $_phone = NULL;
++
++    /**
+      * required apps
+      * @var array
+      */
+     protected static $_requiredApplications = array('Admin');
      
      /**
       * the constructor
              'web_language' => 'English'
          ));
          
 -        Voipmanager_Controller_Snom_Phone::getInstance()->create(new Voipmanager_Model_Snom_Phone(array(
 +        $this->_phone = Voipmanager_Controller_Snom_Phone::getInstance()->create(new Voipmanager_Model_Snom_Phone(array(
-             'description'       => Tinebase_Record_Abstract::generateUID(),
+             'description'       => 'Created by Tine 2.0 DEMO DATA',
              'macaddress'        => substr(Tinebase_Record_Abstract::generateUID(), 0, 12),
              'location_id'       => $returnedLocation['id'],
              'template_id'       => $returnedTemplate['id'],