From 64ddaa40a8a4d27347169ee9eb1bfe43b3dfc2ee Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 6 Feb 2015 16:17:04 +0200 Subject: [PATCH] add reminder time --- .../Modules/Crm/Resources/metadata/entityDefs/Reminder.json | 2 +- .../modules/crm/src/views/meeting/fields/reminders.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Reminder.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Reminder.json index 199c6d9a65..c907e5998d 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Reminder.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Reminder.json @@ -17,7 +17,7 @@ }, "seconds": { "type": "enumInt", - "options": [0, 60, 120, 300, 900, 1800, 3600, 7200, 10800, 18000, 86400], + "options": [0, 60, 120, 300, 600, 900, 1800, 3600, 7200, 10800, 18000, 86400], "default": 0 }, "entityType": { diff --git a/frontend/client/modules/crm/src/views/meeting/fields/reminders.js b/frontend/client/modules/crm/src/views/meeting/fields/reminders.js index 8a282e3fc3..7d34ea1ac6 100644 --- a/frontend/client/modules/crm/src/views/meeting/fields/reminders.js +++ b/frontend/client/modules/crm/src/views/meeting/fields/reminders.js @@ -22,7 +22,7 @@ Espo.define('Crm:Views.Meeting.Fields.Reminders', 'Views.Fields.Base', function (Dep) { return Dep.extend({ - + detailTemplate: 'crm:meeting.fields.reminders.detail', listTemplate: 'crm:meeting.fields.reminders.detail', @@ -33,7 +33,7 @@ Espo.define('Crm:Views.Meeting.Fields.Reminders', 'Views.Fields.Base', function 'click [data-action="addReminder"]': function () { var type = this.getMetadata().get('entityDefs.Reminder.fields.type.default'); var seconds = this.getMetadata().get('entityDefs.Reminder.fields.seconds.default'); - + var item = { type: type, seconds: seconds @@ -66,7 +66,7 @@ Espo.define('Crm:Views.Meeting.Fields.Reminders', 'Views.Fields.Base', function }, this); this.typeList = this.getMetadata().get('entityDefs.Reminder.fields.type.options'); - this.secondsList = this.getMetadata().get('entityDefs.Reminder.fields.seconds.options');; + this.secondsList = this.getMetadata().get('entityDefs.Reminder.fields.seconds.options'); }, afterRender: function () {