diff --git a/fleetactivitytracking/forms.py b/fleetactivitytracking/forms.py index 3bdb8d0d..a9c5d35b 100644 --- a/fleetactivitytracking/forms.py +++ b/fleetactivitytracking/forms.py @@ -13,4 +13,4 @@ def get_fleet_list(): class FatlinkForm(forms.Form): fatname = forms.CharField(label='Name of fat-link', required=True) duration = forms.IntegerField(label="Duration of fat-link", required=True, initial=30, min_value=1, max_value=2147483647) - fleet = forms.ChoiceField(label="Fleet", choices=get_fleet_list()) \ No newline at end of file + fleet = forms.ModelChoiceField(label="Fleet", queryset=optimer.objects.all().order_by('operation_name')) \ No newline at end of file diff --git a/optimer/models.py b/optimer/models.py index fc4492a1..583997cf 100644 --- a/optimer/models.py +++ b/optimer/models.py @@ -19,4 +19,8 @@ class optimer(models.Model): details = models.CharField(max_length=254, default="") post_time = models.DateTimeField(default=timezone.now) eve_character = models.ForeignKey(EveCharacter) - + + def __str__(self): + output = self.operation_name + return output.encode('utf-8') + diff --git a/stock/templates/public/clickfatlinkview.html b/stock/templates/public/clickfatlinkview.html index a6526179..a344a44f 100644 --- a/stock/templates/public/clickfatlinkview.html +++ b/stock/templates/public/clickfatlinkview.html @@ -26,7 +26,7 @@ - +