Fix extra origin in urls

stsewd · stsewd · commit 82944cad1d1d · 2019-03-21T22:21:28.000-05:00
`verbose_name` is unique in each project, because we only have one remote. `identifier` includes origin for branches and also it can point to the same commit in tags. Fixes readthedocs#5518
diff --git a/readthedocs/projects/forms.py b/readthedocs/projects/forms.py
@@ -232,11 +232,11 @@ def __init__(self, *args, **kwargs):
 
         default_choice = (None, '-' * 9)
         all_versions = self.instance.versions.values_list(
-            'identifier',
             'verbose_name',
+            flat=True
         )
         self.fields['default_branch'].widget = forms.Select(
-            choices=[default_choice] + list(all_versions),
+            choices=[default_choice] + list(zip(all_versions, all_versions)),
         )
 
         active_versions = self.get_all_active_versions()

Original file line number	Diff line number	Diff line change
`@@ -232,11 +232,11 @@ def __init__(self, args, *kwargs):`
`232`	`232`
`233`	`233`	`default_choice = (None, '-' * 9)`
`234`	`234`	`all_versions = self.instance.versions.values_list(`
`235`		`- 'identifier',`
`236`	`235`	`'verbose_name',`
	`236`	`+ flat=True`
`237`	`237`	`)`
`238`	`238`	`self.fields['default_branch'].widget = forms.Select(`
`239`		`- choices=[default_choice] + list(all_versions),`
	`239`	`+ choices=[default_choice] + list(zip(all_versions, all_versions)),`
`240`	`240`	`)`
`241`	`241`
`242`	`242`	`active_versions = self.get_all_active_versions()`