diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2016-05-03 19:46:47 +0300 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2016-05-03 19:46:47 +0300 |
| commit | 6de0d6f29328d83bb1730329c3a803ba6eff9738 (patch) | |
| tree | 2b7b71da61095b4a4f6f5304a7fe6122c2ddd111 | |
| parent | 271dff53951658638bc798145243ee9f955b8304 (diff) | |
| parent | e352fb137e27c2b7603cf27d36190ab04752f5e3 (diff) | |
Merge pull request #1464 from owncloud/fix-drafts-issues
return UID correctly so old drafts are automatically removed
| -rw-r--r-- | js/service/messageservice.js | 4 | ||||
| -rw-r--r-- | js/views/composer.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/service/messageservice.js b/js/service/messageservice.js index 8a9256efe..1a606ba9d 100644 --- a/js/service/messageservice.js +++ b/js/service/messageservice.js @@ -290,10 +290,10 @@ define(function(require) { collection.set([message], {remove: false}); } } - defer.resolve(arguments); + defer.resolve(data); }, error: function() { - defer.reject(arguments); + defer.reject(); }, data: { to: message.to, diff --git a/js/views/composer.js b/js/views/composer.js index 589c37739..e57c05d77 100644 --- a/js/views/composer.js +++ b/js/views/composer.js @@ -126,6 +126,7 @@ define(function(require) { if (!this.isReply()) { this.accounts = options.accounts; this.account = options.account || this.accounts.at(0); + this.draftUID = options.data.id; } else { this.account = options.account; this.folderId = options.folderId; |