diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 79508449b..0f37da84f 100644
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -33,8 +33,13 @@ def show
end
def new
- @story = Story.new.decorate
- @story = @story.decorate
+ if params[:story_idea_id].present?
+ @story_idea = StoryIdea.find(params[:story_idea_id])
+ @story = Story.new(set_story_attributes_from(@story_idea))
+ else
+ @story = Story.new
+ end
+ @story.decorate
set_form_variables
end
@@ -52,7 +57,9 @@ def create
@story = Story.new(story_params)
if @story.save
- if params.dig(:library_asset, :new_assets).present?
+ if params[:promote_idea_assets] == "true"
+ @story.attach_assets_from_idea!
+ elsif params.dig(:library_asset, :new_assets).present?
update_asset_owner(@story)
end
@@ -108,4 +115,15 @@ def story_params
:created_by_id, :updated_by_id, :story_idea_id, :spotlighted_facilitator_id
)
end
+
+ def set_story_attributes_from(idea)
+ {
+ rhino_body: idea.body,
+ project_id: idea.project.id,
+ workshop_id: idea.workshop_id,
+ external_workshop_title: idea.external_workshop_title,
+ windows_type_id: idea.windows_type_id,
+ youtube_url: idea.youtube_url
+ }
+ end
end
diff --git a/app/controllers/workshop_ideas_controller.rb b/app/controllers/workshop_ideas_controller.rb
index 6e899a1f9..820209068 100644
--- a/app/controllers/workshop_ideas_controller.rb
+++ b/app/controllers/workshop_ideas_controller.rb
@@ -29,7 +29,7 @@ def create
notification_type: 0)
if params.dig(:library_asset, :new_assets).present?
- update_asset_owner(@workshop)
+ update_asset_owner(@workshop_idea)
end
redirect_to workshop_ideas_path, notice: "Workshop idea was successfully created."
diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb
index fe3b200e6..d4947a693 100644
--- a/app/controllers/workshops_controller.rb
+++ b/app/controllers/workshops_controller.rb
@@ -83,7 +83,9 @@ def create
Workshop.transaction do
if @workshop.save
assign_associations(@workshop)
- if params.dig(:library_asset, :new_assets).present?
+ if params[:promote_idea_assets] == "true"
+ @workshop.attach_assets_from_idea!
+ elsif params.dig(:library_asset, :new_assets).present?
update_asset_owner(@workshop)
end
success = true
@@ -298,7 +300,7 @@ def workshop_params
sector_ids: [],
workshop_series_children_attributes: [ :id, :workshop_child_id, :workshop_parent_id, :theme_name,
:series_description, :series_description_spanish,
- :position, :_destroy ],
+ :position, :_destroy ]
)
end
diff --git a/app/models/story.rb b/app/models/story.rb
index 72bfc07af..b7fde0746 100644
--- a/app/models/story.rb
+++ b/app/models/story.rb
@@ -83,4 +83,14 @@ def organization_locality
def organization_description
project&.organization_description
end
+
+ def attach_assets_from_idea!
+ return unless story_idea
+ story_idea.assets.find_each do |asset|
+ new_asset = assets.build(type: asset.type)
+ new_asset.file.attach(asset.file.blob)
+ end
+
+ save!
+ end
end
diff --git a/app/models/workshop.rb b/app/models/workshop.rb
index b25ca7708..1fc83de25 100644
--- a/app/models/workshop.rb
+++ b/app/models/workshop.rb
@@ -291,6 +291,16 @@ def featured_or_visitor_featured_changed?
featured_changed? || visitor_featured_changed? || inactive_changed?
end
+ def attach_assets_from_idea!
+ return unless workshop_idea
+
+ workshop_idea.assets.find_each do |asset|
+ new_asset = assets.build(type: asset.type)
+ new_asset.file.attach(asset.file.blob)
+ end
+
+ save!
+ end
private
diff --git a/app/services/workshop_from_idea_service.rb b/app/services/workshop_from_idea_service.rb
index 04d68b1c4..e78b0597a 100644
--- a/app/services/workshop_from_idea_service.rb
+++ b/app/services/workshop_from_idea_service.rb
@@ -9,7 +9,6 @@ def initialize(workshop_idea, user:)
def call
Workshop.new(attributes_from_idea).tap do |workshop|
duplicate_series_children(workshop)
- duplicate_assets(workshop)
end
end
@@ -19,26 +18,44 @@ def call
def attributes_from_idea
workshop_idea.attributes.slice(
- "title", "objective", "objective_spanish",
- "materials", "materials_spanish",
- "optional_materials", "optional_materials_spanish",
- "setup", "setup_spanish",
- "introduction", "introduction_spanish",
- "demonstration", "demonstration_spanish",
- "warm_up", "warm_up_spanish",
- "creation", "creation_spanish",
- "closing", "closing_spanish",
- "opening_circle", "opening_circle_spanish",
- "notes", "notes_spanish",
- "tips", "tips_spanish",
- "windows_type_id", "age_range", "age_range_spanish",
- "visualization", "visualization_spanish",
- "extra_field", "extra_field_spanish",
- "misc1", "misc1_spanish", "misc2", "misc2_spanish",
+ "title", "windows_type_id", "age_range",
"time_intro", "time_closing", "time_creation",
"time_demonstration", "time_warm_up",
"time_opening", "time_opening_circle"
).merge(
+ rhino_objective: workshop_idea.rhino_objective,
+ rhino_materials: workshop_idea.rhino_materials,
+ rhino_optional_materials: workshop_idea.rhino_optional_materials,
+ rhino_setup: workshop_idea.rhino_setup,
+ rhino_introduction: workshop_idea.rhino_introduction,
+ rhino_demonstration: workshop_idea.rhino_demonstration,
+ rhino_warm_up: workshop_idea.rhino_warm_up,
+ rhino_creation: workshop_idea.rhino_creation,
+ rhino_closing: workshop_idea.rhino_closing,
+ rhino_opening_circle: workshop_idea.rhino_opening_circle,
+ rhino_notes: workshop_idea.rhino_notes,
+ rhino_tips: workshop_idea.rhino_tips,
+ rhino_visualization: workshop_idea.rhino_visualization,
+ rhino_extra_field: workshop_idea.rhino_extra_field,
+ rhino_misc1: workshop_idea.rhino_misc1,
+ rhino_misc2: workshop_idea.rhino_misc2,
+ rhino_objective_spanish: workshop_idea.rhino_objective_spanish,
+ rhino_materials_spanish: workshop_idea.rhino_materials_spanish,
+ rhino_optional_materials_spanish: workshop_idea.rhino_optional_materials_spanish,
+ rhino_age_range_spanish: workshop_idea.rhino_age_range_spanish,
+ rhino_setup_spanish: workshop_idea.rhino_setup_spanish,
+ rhino_introduction_spanish: workshop_idea.rhino_introduction_spanish,
+ rhino_opening_circle_spanish: workshop_idea.rhino_opening_circle_spanish,
+ rhino_demonstration_spanish: workshop_idea.rhino_demonstration_spanish,
+ rhino_warm_up_spanish: workshop_idea.rhino_warm_up_spanish,
+ rhino_visualization_spanish: workshop_idea.rhino_visualization_spanish,
+ rhino_creation_spanish: workshop_idea.rhino_creation_spanish,
+ rhino_closing_spanish: workshop_idea.rhino_closing_spanish,
+ rhino_notes_spanish: workshop_idea.rhino_notes_spanish,
+ rhino_tips_spanish: workshop_idea.rhino_tips_spanish,
+ rhino_misc1_spanish: workshop_idea.rhino_misc1_spanish,
+ rhino_misc2_spanish: workshop_idea.rhino_misc2_spanish,
+ rhino_extra_field_spanish: workshop_idea.rhino_extra_field_spanish,
user_id: user.id,
workshop_idea_id: workshop_idea.id,
month: workshop_idea.created_at.month,
@@ -61,10 +78,4 @@ def duplicate_series_children(workshop)
end
)
end
-
- def duplicate_assets(workshop)
- workshop_idea.assets.each do |image|
- workshop.assets.build(file: image.file.blob)
- end
- end
end
diff --git a/app/views/stories/_form.html.erb b/app/views/stories/_form.html.erb
index 419178496..fb42e9371 100644
--- a/app/views/stories/_form.html.erb
+++ b/app/views/stories/_form.html.erb
@@ -125,6 +125,24 @@
<%= f.button :submit, class: "btn btn-primary" %>
+
+ <% if story_idea %>
+
+ <%= label_tag :promote_idea_assets, class: "flex items-start space-x-3 cursor-pointer" do %>
+ <%= check_box_tag :promote_idea_assets, true, false, class: "mt-1 h-5 w-5 text-blue-600 rounded border-gray-300 focus:ring-blue-500" %>
+
+
+
+ If the story idea was submitted with attachments, check this box to transfer them to this new story.
+
+
+
+ (This will override any attachments uploaded in the form below once you click submit.)
+
+
+ <% end %>
+
<%= render "assets/form", owner: @story %>
diff --git a/app/views/workshop_ideas/_form.html.erb b/app/views/workshop_ideas/_form.html.erb
index 39c50c9eb..14a465c89 100644
--- a/app/views/workshop_ideas/_form.html.erb
+++ b/app/views/workshop_ideas/_form.html.erb
@@ -7,7 +7,11 @@
<%= tag.div class: "unpersisted_resource_asset_params" %>
- <% if current_user.super_user && f.object.workshops.any? %>
+ <%= f.hidden_field :created_by_id, value: current_user&.id unless f.object.persisted? %>
+ <%= f.hidden_field :updated_by_id, value: current_user&.id %>
+
+ <% promoted_to_workshop = f.object.workshops.any? %>
+ <% if promoted_to_workshop %>
This workshops idea has been promoted to a
<% f.object.workshops.each do |workshop| %>
@@ -16,11 +20,13 @@
<% end %>
and should not be edited here.
+ <% elsif current_user.super_user? && f.object.persisted? %>
+
+ <%= link_to "Promote to Workshop", new_workshop_path(workshop_idea_id: @workshop_idea.id),
+ class: "btn btn-secondary-outline",
+ data: { confirm: "All edits must be saved before promoting. Are you sure you wish to promote?All edits must be saved before promoting." } %>
+
<% end %>
-
- <%= f.hidden_field :created_by_id, value: current_user&.id unless f.object.persisted? %>
- <%= f.hidden_field :updated_by_id, value: current_user&.id %>
-
diff --git a/app/views/workshops/_form.html.erb b/app/views/workshops/_form.html.erb
index ec3a4c133..559cf8ee3 100644
--- a/app/views/workshops/_form.html.erb
+++ b/app/views/workshops/_form.html.erb
@@ -431,6 +431,24 @@
<%= f.submit "Submit", class: "btn btn-primary" %>
+
+ <% if @workshop_idea %>
+
+ <%= label_tag :promote_idea_assets, class: "flex items-start space-x-3 cursor-pointer" do %>
+ <%= check_box_tag :promote_idea_assets, true, false, class: "mt-1 h-5 w-5 text-blue-600 rounded border-gray-300 focus:ring-blue-500" %>
+
+
+
+ If the workshop idea was submitted with attachments, check this box to transfer them to this new workshop.
+
+
+
+ (This will override any attachments uploaded in the form below once you click submit.)
+
+
+ <% end %>
+
+ <% end %>
<% end %>