Merge branch 'NES-991' into dev

neuromat · Oct 25, 2019 · 8d7ecdb · 8d7ecdb
2 parents 0d55386 + ad0d125
commit 8d7ecdb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/patientregistrationsystem/qdc/export/templates/export/experiment_selection.html b/patientregistrationsystem/qdc/export/templates/export/experiment_selection.html
@@ -97,9 +97,9 @@ <h4>{% trans "Filters selection" %}</h4>
                         <div class="col-xs-12 col-xs-12">
                             <p><strong>{% trans "License" %}</strong></p>
                             <input type="radio" name="license" id="license1" value="0" checked>
-                            <label for="license1">Copyright</label><br>
+                            <label for="license1">Creative Commons</label><br>
                             <input type="radio" name="license" id="license2" value="1">
-                            <label for="license2">Creative Commons</label>
+                            <label for="license2">Copyright</label>
                         </div>
                     </div>
                 </div>

diff --git a/patientregistrationsystem/qdc/export/templates/export/export_data.html b/patientregistrationsystem/qdc/export/templates/export/export_data.html
@@ -145,10 +145,10 @@ <h4>{% trans "General Information" %}</h4>
                             </div>
                             <div class="col-xs-6 col-sm-6">
                                 <p><strong>{% trans "License" %}</strong></p>
-                                <input type="radio" name="license" id="license0" value="0" checked>
-                                <label for="license0">Creative Commons</label><br>
-                                <input type="radio" name="license" id="license1" value="1">
-                                <label for="license1">Copyright</label>
+                                <input type="radio" name="license" id="license1" value="0" checked>
+                                <label for="license1">Creative Commons</label><br>
+                                <input type="radio" name="license" id="license2" value="1">
+                                <label for="license2">Copyright</label>
                             </div>
                         </div>
                     </div>

diff --git a/patientregistrationsystem/qdc/export/tests/test_views.py b/patientregistrationsystem/qdc/export/tests/test_views.py
@@ -3655,7 +3655,7 @@ def test_export_per_participant_adds_questionnaires_contributors_to_datapackage_
 
     @override_settings(MEDIA_ROOT=TEMP_MEDIA_ROOT)
     @patch('survey.abc_search_engine.Server')
-    def test_export_per_participant_displays_license_options_in_form(self, mockServer):
+    def test_export_per_participant_displays_license_options_in_form_with_default_to_creative_commons(self, mockServer):
         survey = create_survey(LIMESURVEY_SURVEY_ID_1)
         UtilTests.create_response_survey(self.user, self.patient, survey, token_id=1)
         set_mocks8(mockServer)