Compare commits

..

No commits in common. "1d013685708dd1749d43363b9dfb7440b884d617" and "119acdd734f0ccaddde61126fcdb0fb684ec35ff" have entirely different histories.

5 changed files with 2 additions and 48 deletions

View File

@ -31,7 +31,6 @@ REGISTRATION_OPEN = getenv("REGISTRATION_OPEN", "false").lower() in trues
# Hook URL, do not include leading or trailing slash
HOOK_PATH = "hook"
ASSET_PATH = "asset"
NOTIFY_TOPIC = getenv("NOTIFY_TOPIC", "great-fisk")
@ -52,4 +51,4 @@ if DEBUG:
"10.0.2.2",
]
SETTINGS_EXPORT = ["STRIPE_ENABLED", "URL", "HOOK_PATH", "ASSET_PATH"]
SETTINGS_EXPORT = ["STRIPE_ENABLED", "URL", "HOOK_PATH"]

View File

@ -1,24 +0,0 @@
# Generated by Django 4.1.6 on 2023-02-10 21:07
from django.db import migrations, models
import uuid
class Migration(migrations.Migration):
dependencies = [
('core', '0053_assetrestriction_pairs_parsed_and_more'),
]
operations = [
migrations.AddField(
model_name='assetrestriction',
name='webhook_id',
field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
),
migrations.AlterField(
model_name='assetgroup',
name='allowed',
field=models.JSONField(blank=True, default=dict, null=True),
),
]

View File

@ -1,4 +1,3 @@
import uuid
from datetime import timedelta
import stripe
@ -440,8 +439,6 @@ class AssetRestriction(models.Model):
pairs = models.CharField(max_length=4096, null=True, blank=True)
pairs_parsed = models.JSONField(null=True, blank=True)
webhook_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
group = models.ForeignKey(
AssetGroup, on_delete=models.CASCADE, null=True, blank=True
)

View File

@ -14,7 +14,6 @@
<th>description</th>
<th>pairs</th>
<th>group</th>
<th>hook</th>
<th>actions</th>
</thead>
{% for item in object_list %}
@ -25,15 +24,6 @@
<td>{{ item.description }}</td>
<td>{{ item.pairs_parsed|length }}</td>
<td>{{ item.group }}</td>
<td>
<a
class="has-text-grey"
onclick="window.prompt('Copy to clipboard: Ctrl+C, Enter', '{{settings.URL}}/{{settings.ASSET_PATH}}/{{ item.webhook_id }}');">
<span class="icon" data-tooltip="Copy to clipboard">
<i class="fa-solid fa-copy" aria-hidden="true"></i>
</span>
</a>
</td>
<td>
<div class="buttons">
<button

View File

@ -20,15 +20,7 @@
<td>{{ item.id }}</td>
<td>{{ item.user }}</td>
<td>{{ item.name }}</td>
<td>
<a
class="has-text-grey"
onclick="window.prompt('Copy to clipboard: Ctrl+C, Enter', '{{settings.URL}}/{{settings.HOOK_PATH}}/{{ item.hook }}');">
<span class="icon" data-tooltip="Copy to clipboard">
<i class="fa-solid fa-copy" aria-hidden="true"></i>
</span>
</a>
</td>
<td><code>{{settings.URL}}/{{settings.HOOK_PATH}}/{{ item.hook }}/</code></td>
<td>{{ item.received }}</td>
<td>
<div class="buttons">