Merge branch 'pu/2013.03/modelconfig-hr'
[tine20] / tine20 / Calendar / js / Model.js
index ce96726..0573aa0 100644 (file)
@@ -199,7 +199,7 @@ Tine.Calendar.Model.Event.getFilterModel = function() {
     var app = Tine.Tinebase.appMgr.get('Calendar');
     
     return [
-        {label: _('Quick search'), field: 'query', operators: ['contains']},
+        {label: _('Quick Search'), field: 'query', operators: ['contains']},
         {label: app.i18n._('Summary'), field: 'summary'},
         {label: app.i18n._('Location'), field: 'location'},
         {label: app.i18n._('Description'), field: 'description'},
@@ -503,7 +503,7 @@ Tine.Calendar.Model.Attender.getAttendeeStore = function(attendeeData) {
     
     Ext.each(attendeeData, function(attender) {
         if (attender) {
-            var record = new Tine.Calendar.Model.Attender(attender, attender.id);
+            var record = new Tine.Calendar.Model.Attender(attender, attender.id && Ext.isString(attender.id) ? attender.id : Ext.id());
             attendeeStore.addSorted(record);
         }
     });