ish_manager 0.1.8.393 → 0.1.8.394
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d5c26994da09cbf70a9dadd1e16d13065210254c3e8f179b4280bf94e362f4e7
|
|
4
|
+
data.tar.gz: 7f1c8488ca6b6e064cb5acd31697b710ad93d407565099971a52557ba288cb18
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5991b77d0bd5a95d9724547033e3a28f455813d4aef0708167e14452dba4e0972e9f4ac94e8e9f266a5d9842073cdf091bc2ac386c225c76a16638cbfb9ccd04
|
|
7
|
+
data.tar.gz: 2a859c9c6dd00709ac1563ba471e069e9f1eceda63552b86f5b4443116293ec034916f742e48385f7658b271268c3bb77c712240ac7f47ceb0ee1711a918a1b3
|
|
@@ -80,12 +80,14 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
|
|
|
80
80
|
|
|
81
81
|
def new
|
|
82
82
|
authorize! :new, ::Ish::EmailContext
|
|
83
|
-
@tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first ||
|
|
83
|
+
@tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first ||
|
|
84
|
+
Ish::EmailTemplate.where( id: params[:template_slug] ).first ||
|
|
85
|
+
Ish::EmailTemplate.new
|
|
84
86
|
attrs = {}
|
|
85
87
|
if @tmpl
|
|
86
88
|
attrs = @tmpl.attributes.slice( :subject, :body, :from_email )
|
|
87
89
|
end
|
|
88
|
-
@ctx = ::Ish::EmailContext.new(
|
|
90
|
+
@ctx = ::Ish::EmailContext.new({ email_template: @tmpl }.merge(attrs))
|
|
89
91
|
end
|
|
90
92
|
|
|
91
93
|
def show
|
|
@@ -36,7 +36,10 @@
|
|
|
36
36
|
.tab-raw
|
|
37
37
|
= f.text_area :body
|
|
38
38
|
.tab-preview
|
|
39
|
-
|
|
39
|
+
- if ctx.new_record?
|
|
40
|
+
New record...
|
|
41
|
+
- else
|
|
42
|
+
%iframe{ src: email_context_iframe_path(ctx), width: '100%', height: '100%' }
|
|
40
43
|
|
|
41
44
|
|
|
42
45
|
.actions
|