Merge branch 'master' into AO3-5037_ruby_2_4_5_upgrade

otwcode · Sep 29, 2019 · 39b786a · 39b786a
2 parents befa975 + 008703d
commit 39b786a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/api/v2/works_controller.rb b/app/controllers/api/v2/works_controller.rb
@@ -206,7 +206,7 @@ def story_parser_options(archivist, work_params)
       collection_names: work_params[:collection_names],
       title: work_params[:title],
       fandom: work_params[:fandoms],
-      archive_warning: work_params[:archive_warnings],
+      archive_warning: work_params[:warnings],
       character: work_params[:characters],
       rating: work_params[:rating],
       relationship: work_params[:relationships],

diff --git a/spec/controllers/api/v2/api_works_spec.rb b/spec/controllers/api/v2/api_works_spec.rb
@@ -157,7 +157,7 @@
               title: api_fields[:title],
               summary: api_fields[:summary],
               fandoms: api_fields[:fandoms],
-              archive_warnings: api_fields[:warnings],
+              warnings: api_fields[:warnings],
               characters: api_fields[:characters],
               rating: api_fields[:rating],
               relationships: api_fields[:relationships],
@@ -374,7 +374,7 @@
               detect_tags: false,
               summary: api_fields[:summary],
               fandoms: api_fields[:fandoms],
-              archive_warnings: api_fields[:warnings],
+              warnings: api_fields[:warnings],
               characters: api_fields[:characters],
               rating: api_fields[:rating],
               relationships: api_fields[:relationships],