XF
/
fisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix adding asset restrictions

This commit is contained in:
Mark Veidemanis 2023-02-11 17:45:22 +00:00
parent 33d8e26c9b
commit 7afdd39af7
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/forms.py
View File

@ -333,7 +333,7 @@ class AssetRestrictionForm(RestrictedFormMixin, ModelForm):
"pairs": "Comma-separated list of pairs to restrict when a webhook is received. This does nothing on its own.", "pairs": "Comma-separated list of pairs to restrict when a webhook is received. This does nothing on its own.",
} }
pairs_parsed = forms.BooleanField(widget=forms.HiddenInput) pairs_parsed = forms.BooleanField(widget=forms.HiddenInput, required=False)
def clean(self): def clean(self):
cleaned_data = super(AssetRestrictionForm, self).clean() cleaned_data = super(AssetRestrictionForm, self).clean()
@ -351,5 +351,7 @@ class AssetRestrictionForm(RestrictedFormMixin, ModelForm):
return return
cleaned_data["pairs_parsed"] = new_pairs cleaned_data["pairs_parsed"] = new_pairs
else:
cleaned_data["pairs_parsed"] = {}
return cleaned_data return cleaned_data

2
core/models.py
View File

@ -426,7 +426,7 @@ class AssetRestriction(models.Model):
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
description = models.TextField(null=True, blank=True) description = models.TextField(null=True, blank=True)
pairs = models.CharField(max_length=4096, null=True, blank=True) pairs = models.CharField(max_length=4096, null=True, blank=True)
pairs_parsed = models.JSONField(null=True, blank=True, default=dict) pairs_parsed = models.JSONField(null=True, blank=True, default=list)
webhook_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True) webhook_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)

2
core/trading/assetfilter.py
View File

@ -4,4 +4,4 @@ def get_allowed(strategy, symbol, direction):
linked to the strategy. linked to the strategy.
""" """
#asset_group = strategy. # asset_group = strategy.

4
core/views/assets.py
View File

@ -86,6 +86,10 @@ class AssetRestrictionCreate(
submit_url_name = "assetrestriction_create" submit_url_name = "assetrestriction_create"
submit_url_args = ["type", "group"] submit_url_args = ["type", "group"]
def form_invalid(self, form):
"""If the form is invalid, render the invalid form."""
return self.get(self.request, **self.kwargs, form=form)
def pre_save_mutate(self, user, obj): def pre_save_mutate(self, user, obj):
try: try:
assetgroup = AssetGroup.objects.get(pk=self.kwargs["group"], user=user) assetgroup = AssetGroup.objects.get(pk=self.kwargs["group"], user=user)