Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Aug 2013 15:51:10 +0000 (17:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Aug 2013 15:51:10 +0000 (17:51 +0200)
Conflicts:
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js

1  2 
tine20/Tinebase/ModelConfiguration.php
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
tine20/Tinebase/js/widgets/grid/GridPanel.js

@@@ -165,10 -166,19 +166,19 @@@ Tine.Tinebase.ApplicationStarter = 
                  case 'boolean':
                      gridRenderer = Tine.Tinebase.common.booleanRenderer;
                      break;
 -                var cc = config.config;
+                 case 'relation':
 -                 default:
++                    var cc = config.config;
+                     gridRenderer = new Tine.widgets.relation.GridRenderer({
+                         appName: appName,
+                         type: cc.type,
+                         foreignApp: cc.appName,
+                         foreignModel: cc.modelName
+                         });
+                     break;
 +                default:
                      gridRenderer = Ext.util.Format.htmlEncode;
--                 }
--           }
++            }
++        }
          return gridRenderer;
      },