From 564a7e8254cf02f7a99a8abc1b24c77a7a7acccb Mon Sep 17 00:00:00 2001
From: HugoNeveux
Date: Mon, 27 Apr 2020 18:47:24 +0200
Subject: [PATCH] Add error when required field is missing in .toml file
---
PDMI/store/forms.py | 9 +++++++--
PDMI/store/models.py | 3 ++-
PDMI/store/templates/store/base.html | 20 ++++++++++----------
PDMI/store/templates/store/index.html | 17 ++++++++---------
PDMI/store/templates/store/upload.html | 5 +++--
PDMI/store/views.py | 11 +++++++++--
6 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/PDMI/store/forms.py b/PDMI/store/forms.py
index adfaff6..d1217a2 100644
--- a/PDMI/store/forms.py
+++ b/PDMI/store/forms.py
@@ -4,19 +4,24 @@ from bootstrap_modal_forms.mixins import PopRequestMixin, CreateUpdateAjaxMixin
from django import forms
from .models import Version
+
class CustomUserCreationForm(PopRequestMixin, CreateUpdateAjaxMixin,
UserCreationForm):
class Meta:
model = User
fields = ['username', 'email', 'password1', 'password2']
+
class CustomAuthenticationForm(AuthenticationForm):
class Meta:
model = User
fields = ['username', 'password']
+
class FileFieldForm(forms.Form):
- file = forms.FileField(widget=forms.ClearableFileInput(attrs={'multiple': True}))
+ file = forms.FileField(
+ widget=forms.ClearableFileInput(attrs={'multiple': True}))
+
class FileFieldForm(forms.ModelForm):
class Meta:
@@ -24,7 +29,7 @@ class FileFieldForm(forms.ModelForm):
fields = ['file']
widgets = {
'file': forms.ClearableFileInput(
- attrs = {
+ attrs={
'multiple': True
}
)
diff --git a/PDMI/store/models.py b/PDMI/store/models.py
index f6054ea..3d027ae 100644
--- a/PDMI/store/models.py
+++ b/PDMI/store/models.py
@@ -16,7 +16,7 @@ def upload_path(instance, filename):
class Module(models.Model):
- name = models.CharField(max_length=255)
+ name = models.CharField(max_length=255, unique=True)
desc = models.TextField(max_length=2048, null=True)
creator = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
@@ -34,6 +34,7 @@ class Version(models.Model):
def __str__(self):
return self.ver
+
class Dependency(models.Model):
version = models.ForeignKey(Version, on_delete=models.CASCADE)
dep_module = models.CharField(max_length=255)
diff --git a/PDMI/store/templates/store/base.html b/PDMI/store/templates/store/base.html
index f347cb1..0522cd2 100644
--- a/PDMI/store/templates/store/base.html
+++ b/PDMI/store/templates/store/base.html
@@ -37,14 +37,14 @@
{% endblock body %}
{% block extra_js %}
-
+
{% endblock extra_js %}
diff --git a/PDMI/store/templates/store/index.html b/PDMI/store/templates/store/index.html
index 1b7d6e3..19f0fd5 100644
--- a/PDMI/store/templates/store/index.html
+++ b/PDMI/store/templates/store/index.html
@@ -7,9 +7,8 @@
PDMI Store
@@ -25,8 +24,8 @@
Card subtitle - Description
Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
- sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
-
+ sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+
View details »
@@ -45,8 +44,8 @@
Card subtitle - Description
Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
- sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
-
+ sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+
View details »
@@ -65,8 +64,8 @@
Card subtitle - Description
Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
- sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
-
+ sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+
View details »
diff --git a/PDMI/store/templates/store/upload.html b/PDMI/store/templates/store/upload.html
index 41e4474..cbe735c 100644
--- a/PDMI/store/templates/store/upload.html
+++ b/PDMI/store/templates/store/upload.html
@@ -8,8 +8,8 @@
{% block body %}