Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Mar 2015 15:16:03 +0000 (16:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Mar 2015 15:16:03 +0000 (16:16 +0100)
1  2 
tine20/Calendar/js/EventEditDialog.js

@@@ -166,7 -166,7 +166,7 @@@ Tine.Calendar.EventEditDialog = Ext.ext
                                      containerName: this.app.i18n.n_hidden(this.recordClass.getMeta('containerName'), this.recordClass.getMeta('containersName'), 1),
                                      containersName: this.app.i18n._hidden(this.recordClass.getMeta('containersName')),
                                      appName: this.app.appName,
-                                     requiredGrant: this.record.data.id ? ['editGrant'] : ['addGrant'],
+                                     requiredGrant: 'readGrant',
                                      disabled: true
                                  }), Ext.apply(this.perspectiveCombo.getAttendeeContainerField(), {
                                      columnWidth: 1
       * @param {} button
       * @param {} e
       */
 -    onMuteAlertOnce: function (button, e) {
 +    onMuteNotificationOnce: function (button, e) {
          this.record.set('mute', button.pressed);
      },
  
      initComponent: function() {
          this.tbarItems.push(new Ext.Button(new Ext.Action({
 -                    text: Tine.Tinebase.appMgr.get('Calendar').i18n._('Mute Alert'),
 -                    handler: this.onMuteAlertOnce,
 +                    text: Tine.Tinebase.appMgr.get('Calendar').i18n._('Mute Notification'),
 +                    handler: this.onMuteNotificationOnce,
                      iconCls: 'notes_noteIcon',
                      disabled: false,
                      scope: this,