Skip to content

Commit 8de8168

Browse files
committed
Allow the key or apple config to be added if missing after create
1 parent d52de61 commit 8de8168

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

app/controllers/feeds_controller.rb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def index
99

1010
# GET /feeds/1
1111
def show
12-
@feed.assign_attributes(feed_params)
12+
init_config
1313
authorize @feed
1414
@apple_show_options = get_apple_show_options(@feed)
1515
end
@@ -33,21 +33,26 @@ def get_apple_show_options(feed)
3333

3434
def new_apple
3535
@feed = Feeds::AppleSubscription.new(podcast: @podcast, private: true)
36-
@feed.build_apple_config
37-
@feed.apple_config.build_key
3836
authorize @feed
39-
40-
@feed.assign_attributes(feed_params)
37+
init_config
4138
render "new"
4239
end
4340

4441
def new_megaphone
4542
@feed = Feeds::MegaphoneFeed.new(podcast: @podcast, private: true)
46-
@feed.build_megaphone_config
4743
authorize @feed
44+
init_config
45+
render "new"
46+
end
4847

48+
def init_config
4949
@feed.assign_attributes(feed_params)
50-
render "new"
50+
if @feed.is_a? Feeds::AppleSubscription
51+
@feed.apple_config || @feed.build_apple_config
52+
@feed.apple_config.key || @feed.apple_config.build_key
53+
elsif @feed.is_a? Feeds::MegaphoneFeed
54+
@feed.megaphone_config || @feed.build_megaphone_config
55+
end
5156
end
5257

5358
# POST /feeds

0 commit comments

Comments
 (0)