Merge pull request #4050 from avalonmediasystem/bug_fixes

Do not inline structure if query parameter is false
avalonmediasystem · Mar 16, 2020 · a512319 · a512319
2 parents e8cebdd + aba5a47
commit a512319
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/media_objects_controller.rb b/app/controllers/media_objects_controller.rb
@@ -333,7 +333,7 @@ def show
         end
       end
       format.json do
-        response_json = @media_object.as_json(include_structure: params[:include_structure])
+        response_json = @media_object.as_json(include_structure: params[:include_structure] == "true")
         response_json.except!(:files, :visibility, :read_groups) unless current_ability.can? :edit, @media_object
         render json: response_json.to_json
       end

diff --git a/spec/controllers/media_objects_controller_spec.rb b/spec/controllers/media_objects_controller_spec.rb
@@ -936,6 +936,11 @@
           get 'show', params: { id: media_object.id, format:'json', include_structure: true }
           expect(json['files'].first['structure']).to eq master_file.structuralMetadata.content
         end
+
+        it "should not return structure inline if requested not to" do
+          get 'show', params: { id: media_object.id, format:'json', include_structure: false }
+          expect(json['files'].first['structure']).not_to eq master_file.structuralMetadata.content
+        end
       end
     end
   end