Added redis on docker, simplified changes to message_limit

This commit is contained in:
Spitap
2023-06-27 17:00:23 +02:00
parent 9c77c74c7a
commit bd862ec1f1
4 changed files with 20 additions and 32 deletions
+2 -1
View File
@@ -34,7 +34,8 @@ services:
DEBUG: "True"
REDIS_HOST: redis
command: >
sh -c "cd test_project
sh -c "redis-server &
cd test_project
python3 manage.py migrate
python3 manage.py load_initial_data
django-admin compilemessages
@@ -24,15 +24,21 @@
/>
</validation-provider>
<label class="m-label">{{ $gettext('Daily message sending limit') }}</label>
<v-text-field
v-model="form.mailbox.message_limit"
:placeholder="'Leave empty for no limit' | translate"
:hint="'Number of messages this mailbox can send per day. Leave empty for no limit.' | translate"
persistent-hint
outlined
dense
@input="update"
/>
<validation-provider
v-slot="{ errors }"
rules="numeric"
>
<v-text-field
v-model="form.mailbox.message_limit"
:placeholder="'Leave empty for no limit' | translate"
:hint="'Number of messages this mailbox can send per day. Leave empty for no limit.' | translate"
persistent-hint
outlined
dense
:error-messages="errors"
@input="update"
/>
</validation-provider>
</validation-observer>
</template>
@@ -94,6 +100,9 @@ export default {
if (this.form.role === 'SimpleUsers') {
this.$set(this.form.mailbox, 'full_address', this.form.username)
}
if (newValue.mailbox.message_limit === '') {
this.form.mailbox.message_limit = null
}
},
deep: true
}
-11
View File
@@ -152,9 +152,6 @@ class MailboxSerializer(serializers.ModelSerializer):
quota = serializers.CharField(required=False)
quota_usage = serializers.SerializerMethodField()
message_limit = serializers.CharField(
required=False, allow_null=True, allow_blank=True)
class Meta:
model = models.Mailbox
fields = (
@@ -169,14 +166,6 @@ class MailboxSerializer(serializers.ModelSerializer):
"""Lower case address."""
return value.lower()
def validate_message_limit(self, value):
if not value:
return None
try:
return int(value)
except ValueError:
raise ValidationError(_("A valid integer is required."))
def validate_quota(self, value):
"""Convert quota to MB."""
return web_utils.size2integer(value, output_unit="MB")
-11
View File
@@ -389,9 +389,6 @@ class MailboxSerializer(serializers.ModelSerializer):
quota = serializers.CharField(required=False)
message_limit = serializers.CharField(
required=False, allow_null=True, allow_blank=True)
class Meta:
model = models.Mailbox
fields = (
@@ -402,14 +399,6 @@ class MailboxSerializer(serializers.ModelSerializer):
"""Convert quota to MB."""
return web_utils.size2integer(value, output_unit="MB")
def validate_message_limit(self, value):
if value == "":
return None
try:
return int(value)
except ValueError:
raise ValidationError(_("A valid integer is required."))
def validate(self, data):
"""Check if quota is required."""
method = self.context["request"].method