Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:32:41 +0000 (12:32 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:32:41 +0000 (12:32 +0100)
Change-Id: I276d3128e614c3beae28ae3d9868b57df9a559c8

1  2 
tests/tine20/Addressbook/JsonTest.php
tine20/Addressbook/Config.php
tine20/Addressbook/Model/ContactFilter.php
tine20/Addressbook/Model/ContactHiddenFilter.php
tine20/Addressbook/js/ListMemberFilterModel.js
tine20/Addressbook/js/Model.js
tine20/Calendar/Controller/EventNotifications.php
tine20/Tinebase/ModelConfiguration.php

Simple merge
Simple merge
@@@ -44,13 -44,11 +44,11 @@@ Tine.Addressbook.ListMemberFilterModel 
       * @param {Ext.Element} element to render to 
       */
      valueRenderer: function(filter, el) {
-         //var value = new Tine.Addressbook.ListMemberFilterModelValueField({
          var value = new Tine.Tinebase.widgets.form.RecordPickerComboBox({
              blurOnSelect: true,
-             recordClass: Tine.Addressbook.Model.List,
-             //app: this.app,
+             recordClass: this.field == 'list' ? Tine.Addressbook.Model.List : Tine.Addressbook.Model.Contact,
              filter: filter,
 -            width: 200,
 +            width: this.filterValueWidth,
              id: 'tw-ftb-frow-valuefield-' + filter.id,
              value: filter.data.value ? filter.data.value : this.defaultValue,
              renderTo: el
Simple merge