Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:26:56 +0000 (17:26 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:26:56 +0000 (17:26 +0100)
1  2 
tests/tine20/Crm/NotificationsTests.php
tine20/Addressbook/Setup/Initialize.php
tine20/Calendar/js/DaysView.js
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Crm/Controller/Lead.php
tine20/Setup/Controller.php
tine20/Tinebase/Container.php

Simple merge
@@@ -166,10 -166,13 +166,12 @@@ class Crm_Controller_Lead extends Tineb
          
          $view->updater = $_updater;
          $view->lead = $_lead;
 -        $settings = Crm_Controller::getInstance()->getConfigSettings();
 -        $view->leadState = $settings->getOptionById($_lead->leadstate_id, 'leadstates');
 -        $view->leadType = $settings->getOptionById($_lead->leadtype_id, 'leadtypes');
 -        $view->leadSource = $settings->getOptionById($_lead->leadsource_id, 'leadsources');
 +        $view->leadState = Crm_Config::getInstance()->get(Crm_Config::LEAD_STATES)->getTranslatedValue($_lead->leadstate_id);
 +        $view->leadType = Crm_Config::getInstance()->get(Crm_Config::LEAD_TYPES)->getTranslatedValue($_lead->leadtype_id);
 +        $view->leadSource = Crm_Config::getInstance()->get(Crm_Config::LEAD_SOURCES)->getTranslatedValue($_lead->leadsource_id);
          $view->container = Tinebase_Container::getInstance()->getContainerById($_lead->container_id);
+         $view->tags = Tinebase_Tags::getInstance()->getTagsOfRecord($_lead);
+         $view->updates = $this->_getNotificationUpdates($_lead, $_oldLead);
          
          if (isset($_lead->relations)) {
              $customer = $_lead->relations->filter('type', 'CUSTOMER')->getFirstRecord();
Simple merge
Simple merge