Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Dec 2015 14:24:34 +0000 (15:24 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Dec 2015 14:24:34 +0000 (15:24 +0100)
Conflicts:
tine20/Addressbook/js/SearchCombo.js

Change-Id: If65f094ad2094ffbd53fa300f6ed03c593279433

1  2 
tine20/Addressbook/js/SearchCombo.js
tine20/Tinebase/Config.php
tine20/Tinebase/Frontend/Http.php

@@@ -116,22 -113,8 +116,8 @@@ Tine.Addressbook.SearchCombo = Ext.exte
                              '</td>',
                          '</tr>',
                      '</table>',
-                 '</div></tpl>',
-                 {
-                     getIcon: function(contactData) {
-                         return Tine.Addressbook.ContactGridPanel.contactTypeRenderer.call(this, null, null, contactData);
-                     },
-                     encode: function(value, field) {
-                         if (value) {
-                             return Ext.util.Format.htmlEncode(value);
-                         } else {
-                             return field == 'fileas' ?
-                                 Tine.Addressbook.ContactGridPanel.prototype.displayNameRenderer(value) :
-                                 '';
-                         }
-                     }
-                 }
-             );
+                 '</div></tpl>'
 -            );
++             );
          }
      },
      
Simple merge
Simple merge