You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2016/09/10 19:23:58 UTC
[whimsy] branch master updated (cbb5eea -> c1a42b9)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git.
from cbb5eea add file extension
new 04b3b19 send signature with the request
new c1a42b9 save email changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/secmail/models/message.rb | 16 +++++++++-
www/secmail/views/actions/update-mail.json.rb | 14 +++++++++
www/secmail/views/parts.js.rb | 45 +++++++++++++++++++++++----
3 files changed, 68 insertions(+), 7 deletions(-)
create mode 100644 www/secmail/views/actions/update-mail.json.rb
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 02/02: save email changes
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
commit c1a42b9a02bd30b25a7329d06b6ca0b79615e9e7
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Sep 10 15:23:40 2016 -0400
save email changes
---
www/secmail/models/message.rb | 16 +++++++++-
www/secmail/views/actions/update-mail.json.rb | 14 +++++++++
www/secmail/views/parts.js.rb | 43 +++++++++++++++++++++++----
3 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/www/secmail/models/message.rb b/www/secmail/models/message.rb
index 2e048d7..afc0e4e 100644
--- a/www/secmail/models/message.rb
+++ b/www/secmail/models/message.rb
@@ -61,7 +61,21 @@ class Message
end
def cc
- mail[:cc]
+ @headers[:cc]
+ end
+
+ def cc=(value)
+ value=value.split("\n") if String === value
+ @headers[:cc]=value
+ end
+
+ def bcc
+ @headers[:bcc]
+ end
+
+ def bcc=(value)
+ value=value.split("\n") if String === value
+ @headers[:bcc]=value
end
def subject
diff --git a/www/secmail/views/actions/update-mail.json.rb b/www/secmail/views/actions/update-mail.json.rb
new file mode 100644
index 0000000..1fd613b
--- /dev/null
+++ b/www/secmail/views/actions/update-mail.json.rb
@@ -0,0 +1,14 @@
+#
+# update cc and bcc in a message
+#
+
+message = Mailbox.find(@message)
+
+message.cc = @cc
+message.bcc = @bcc
+
+message.write_headers
+
+headers = message.headers.dup
+headers.delete :attachments
+{headers: headers}
diff --git a/www/secmail/views/parts.js.rb b/www/secmail/views/parts.js.rb
index 131fe14..a908d23 100644
--- a/www/secmail/views/parts.js.rb
+++ b/www/secmail/views/parts.js.rb
@@ -71,7 +71,7 @@ class Parts < React
if @selected and not @menu and @selected !~ /\.(asc|sig)$/
_CheckSignature selected: @selected, attachments: @attachments,
- headers: @@headers
+ headers: @headers
_ul.nav.nav_tabs do
_li class: ('active' unless [:edit, :mail].include?(@form)) do
@@ -150,17 +150,17 @@ class Parts < React
_div.partmail! do
_h3 'cc'
- _textarea (@@headers.cc || []).join("\n"), name: 'cc'
+ _textarea value: @cc, name: 'cc'
_h3 'bcc'
- _textarea (@@headers.bcc || []).join("\n"), name: 'bcc'
+ _textarea value: @bcc, name: 'bcc'
- _button.btn.btn_primary 'Save'
+ _button.btn.btn_primary 'Save', onClick: self.update_mail
end
else
- React.createElement @form, headers: @@headers, selected: @selected,
+ React.createElement @form, headers: @headers, selected: @selected,
signature: signature, submit: self.submit
end
@@ -198,6 +198,18 @@ class Parts < React
end
self.hideMenu()
+
+ self.extractHeaders(@@headers)
+ end
+
+ def componentWillReceiveProps()
+ self.extractHeaders(@@headers)
+ end
+
+ def extractHeaders(headers)
+ @cc = (headers.cc || []).join("\n")
+ @bcc = (headers.bcc || []).join("\n")
+ @headers = headers
end
def componentDidUpdate()
@@ -316,6 +328,27 @@ class Parts < React
end
########################################################################
+ # Update email #
+ ########################################################################
+
+ def update_mail(event)
+ event.target.disabled = true
+
+ jQuery.ajax(
+ type: "POST",
+ url: "../../actions/update-mail",
+ data: {
+ message: window.parent.location.pathname,
+ cc: @cc,
+ bcc: @bcc
+ },
+ dataType: 'json',
+ success: ->(data) { self.extractHeaders(data.headers) },
+ complete: -> { event.target.disabled = false }
+ )
+ end
+
+ ########################################################################
# Miscellaneous #
########################################################################
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 01/02: send signature with the request
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
commit 04b3b19fff716271278dd65181fef5625f756cc9
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Sep 10 14:38:12 2016 -0400
send signature with the request
---
www/secmail/views/parts.js.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/secmail/views/parts.js.rb b/www/secmail/views/parts.js.rb
index 71ccb2c..131fe14 100644
--- a/www/secmail/views/parts.js.rb
+++ b/www/secmail/views/parts.js.rb
@@ -161,7 +161,7 @@ class Parts < React
else
React.createElement @form, headers: @@headers, selected: @selected,
- submit: self.submit
+ signature: signature, submit: self.submit
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.