Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 13:07:08 +0000 (14:07 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 13:07:08 +0000 (14:07 +0100)
Change-Id: If58433cea71cb00159f2b275a4aba2a7231afbe6

1  2 
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/FileSystem.php
tine20/Tinebase/js/tineInit.js
tine20/Tinebase/js/widgets/grid/FilterPanel.js

@@@ -320,12 -320,7 +320,12 @@@ Tine.Addressbook.ContactGridPanel.getBa
          { id: 'geo', header: i18n._('Geo'), dataIndex: 'geo' },
          { id: 'bday', header: i18n._('Birthday'), dataIndex: 'bday', renderer: Tine.Tinebase.common.dateRenderer },
          { id: 'memberroles', header: i18n._('List Roles'), dataIndex: 'memberroles', renderer: Tine.Addressbook.ListMemberRoleRenderer }
-     ]
+     ];
 +    if (Tine.Tinebase.appMgr.get('Addressbook').featureEnabled('featureIndustry')) {
 +        columns.push({ id: 'industry', header: i18n._('Industry'), dataIndex: 'industry', renderer: Tine.Tinebase.common.foreignRecordRenderer});
 +    }
 +    
 +    return columns;
  };
  
  /**
Simple merge
Simple merge