From 225a216673e60795318bc9e619b101bb51b65906 Mon Sep 17 00:00:00 2001
From: "Mr. Senko" <atodorov@mrsenko.com>
Date: Wed, 24 Jul 2019 12:52:18 +0300
Subject: [PATCH] Clone TC: always keep default tester. Fixes #838

when cloning test cases we'll always keep the value of
default_tester that was set on the source TC. This is the same
behavior that was introduced when cloning TPs + TCs, see
a9c7ccf3da877fdb615e07e793a3c88b73ed79de
---
 tcms/templates/case/clone.html | 14 --------------
 tcms/testcases/forms.py        |  6 ------
 tcms/testcases/views.py        |  5 +----
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/tcms/templates/case/clone.html b/tcms/templates/case/clone.html
index e138d87e05..5957c76c0d 100644
--- a/tcms/templates/case/clone.html
+++ b/tcms/templates/case/clone.html
@@ -30,20 +30,6 @@ <h2>{% trans "Clone TestCase(s) into" %} TP-{{ test_plan.pk }}: {{ test_plan.nam
                                     <label class="strong title">{% trans "Case(s)" %}</label>
 					<div class="linotype">{{ clone_form.case }}</div>
 				</div>
-				<div class="listinfo">
-                                    <label class="strong title">{% trans "Clone Settings" %}</label>
-					<fieldset class="choose">
-                                            <legend class="">{% trans "Case Properties" %}</legend>
-						<ul class="ul-no-format">
-							<li>
-								{{ clone_form.maintain_case_orignal_default_tester }}
-								<span>
-									<label for="id_maintain_case_orignal_default_tester">{{ clone_form.maintain_case_orignal_default_tester.help_text }}</label>
-								</span>
-							</li>
-						</ul>
-					</fieldset>
-				</div>
 				<div class="submit-row">
 					<input type="hidden" name="from_plan" value="{{ test_plan.pk }}"/>
 					<input type="submit" name="submit" value="Clone" />
diff --git a/tcms/testcases/forms.py b/tcms/testcases/forms.py
index e13bd011b7..a1c0baee01 100644
--- a/tcms/testcases/forms.py
+++ b/tcms/testcases/forms.py
@@ -281,12 +281,6 @@ class CloneCaseForm(forms.Form):
         queryset=TestPlan.objects.all(),
         widget=forms.CheckboxSelectMultiple()
     )
-    maintain_case_orignal_default_tester = forms.BooleanField(
-        label='Keep original default tester',
-        help_text='Keep original default tester (Unchecking will make me as '
-                  'default tester of the copied test case)',
-        required=False
-    )
 
     def populate(self, case_ids):
         self.fields['case'].queryset = TestCase.objects.filter(case_id__in=case_ids)
diff --git a/tcms/testcases/views.py b/tcms/testcases/views.py
index 6c7cc2314a..400cf08a3e 100644
--- a/tcms/testcases/views.py
+++ b/tcms/testcases/views.py
@@ -790,9 +790,7 @@ def clone(request, template_name='case/clone.html'):
                     notes=tc_src.notes,
                     text=tc_src.text,
                     author=request.user,
-                    default_tester=clone_form.cleaned_data[
-                        'maintain_case_orignal_default_tester'] and
-                    tc_src.author or request.user,
+                    default_tester=tc_src.default_tester,
                 )
 
                 # apply tags as well
@@ -863,7 +861,6 @@ def clone(request, template_name='case/clone.html'):
         # Initial the clone case form
         clone_form = CloneCaseForm(initial={
             'case': selected_cases,
-            'maintain_case_orignal_default_tester': False,
         })
         clone_form.populate(case_ids=selected_cases)