mirror of
https://github.com/kristoferssolo/FOSSDB.git
synced 2025-10-21 17:50:35 +00:00
Added HostingPlatform
This commit is contained in:
parent
7fa3e03cdc
commit
f34cf827c8
@ -1,7 +1,7 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from .models import (License, ProgrammingLanguage, Project,
|
from .models import (HostingPlatform, License, ProgrammingLanguage, Project,
|
||||||
ProjectProgrammingLanguage)
|
ProjectHostingPlatform, ProjectProgrammingLanguage)
|
||||||
|
|
||||||
|
|
||||||
class ProjectProgrammingLanguageInline(admin.TabularInline):
|
class ProjectProgrammingLanguageInline(admin.TabularInline):
|
||||||
@ -9,15 +9,23 @@ class ProjectProgrammingLanguageInline(admin.TabularInline):
|
|||||||
extra = 1
|
extra = 1
|
||||||
|
|
||||||
|
|
||||||
class ProjectAdmin(admin.ModelAdmin):
|
class ProjectHostingPlatformInline(admin.TabularInline):
|
||||||
inlines = [ProjectProgrammingLanguageInline]
|
model = ProjectHostingPlatform
|
||||||
list_display = ("author", "name", "get_languages")
|
extra = 1
|
||||||
|
|
||||||
def get_languages(self, object):
|
|
||||||
|
class ProjectAdmin(admin.ModelAdmin):
|
||||||
|
inlines = [ProjectProgrammingLanguageInline, ProjectHostingPlatformInline]
|
||||||
|
list_display = ("author", "name", "_languages", "_hosting_platform")
|
||||||
|
|
||||||
|
def _languages(self, object):
|
||||||
return " | ".join([i.language.language for i in object.projectprogramminglanguage_set.all()])
|
return " | ".join([i.language.language for i in object.projectprogramminglanguage_set.all()])
|
||||||
|
|
||||||
|
def _hosting_platform(self, object):
|
||||||
|
return " | ".join([i.hosting_platform.hosting_platform for i in object.projecthostingplatform_set.all()])
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(License)
|
admin.site.register(License)
|
||||||
admin.site.register(ProgrammingLanguage)
|
admin.site.register(ProgrammingLanguage)
|
||||||
|
admin.site.register(HostingPlatform)
|
||||||
admin.site.register(Project, ProjectAdmin)
|
admin.site.register(Project, ProjectAdmin)
|
||||||
# admin.site.register(HostingPlatform)
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
|
|
||||||
from .models import (License, ProgrammingLanguage, Project,
|
from .models import (HostingPlatform, License, ProgrammingLanguage, Project,
|
||||||
ProjectProgrammingLanguage)
|
ProjectHostingPlatform, ProjectProgrammingLanguage)
|
||||||
|
|
||||||
|
|
||||||
class ProjectForm(forms.ModelForm):
|
class ProjectForm(forms.ModelForm):
|
||||||
@ -28,3 +28,36 @@ class LicenseForm(forms.ModelForm):
|
|||||||
model = License
|
model = License
|
||||||
fields = ["short_name", "full_name", "url", "description"]
|
fields = ["short_name", "full_name", "url", "description"]
|
||||||
|
|
||||||
|
|
||||||
|
class ProgrammingLanguageForm(forms.ModelForm):
|
||||||
|
percentage = forms.IntegerField(min_value=0, max_value=100)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ProgrammingLanguage
|
||||||
|
fields = ["language", "percentage"]
|
||||||
|
|
||||||
|
|
||||||
|
ProjectProgrammingLanguageFormSet = forms.inlineformset_factory(
|
||||||
|
Project,
|
||||||
|
ProjectProgrammingLanguage,
|
||||||
|
form=ProgrammingLanguageForm,
|
||||||
|
extra=1,
|
||||||
|
can_delete=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class HostingPlatformForm(forms.ModelForm):
|
||||||
|
url = forms.URLField()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = HostingPlatform
|
||||||
|
fields = ["hosting_platform", "url"]
|
||||||
|
|
||||||
|
|
||||||
|
ProjectHostingPlatformFormSet = forms.inlineformset_factory(
|
||||||
|
Project,
|
||||||
|
ProjectHostingPlatform,
|
||||||
|
form=HostingPlatformForm,
|
||||||
|
extra=1,
|
||||||
|
can_delete=False
|
||||||
|
)
|
||||||
|
|||||||
@ -28,12 +28,29 @@ class ProjectProgrammingLanguage(models.Model):
|
|||||||
return f"{self.project} | {self.language} | {self.percentage}%"
|
return f"{self.project} | {self.language} | {self.percentage}%"
|
||||||
|
|
||||||
|
|
||||||
|
class HostingPlatform(models.Model):
|
||||||
|
hosting_platform = models.CharField(max_length=100)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.hosting_platform
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectHostingPlatform(models.Model):
|
||||||
|
project = models.ForeignKey("Project", on_delete=models.CASCADE)
|
||||||
|
hosting_platform = models.ForeignKey(HostingPlatform, on_delete=models.CASCADE)
|
||||||
|
url = models.URLField()
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"{self.project} | {self.hosting_platform}"
|
||||||
|
|
||||||
|
|
||||||
class Project(models.Model):
|
class Project(models.Model):
|
||||||
author = models.ForeignKey(User, on_delete=models.CASCADE)
|
author = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||||
name = models.CharField(max_length=255, null=False)
|
name = models.CharField(max_length=255, null=False)
|
||||||
description = models.TextField()
|
description = models.TextField()
|
||||||
licenses = models.ManyToManyField(License)
|
licenses = models.ManyToManyField(License)
|
||||||
programming_languages = models.ManyToManyField(ProgrammingLanguage, through="ProjectProgrammingLanguage", related_name="projects")
|
programming_languages = models.ManyToManyField(ProgrammingLanguage, through="ProjectProgrammingLanguage", related_name="projects")
|
||||||
|
hosting_platform = models.ManyToManyField(HostingPlatform, through="ProjectHostingPlatform", related_name="projects")
|
||||||
date_created = models.DateTimeField(auto_now_add=True)
|
date_created = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
from django.contrib.auth.decorators import login_required, permission_required
|
from django.contrib.auth.decorators import login_required, permission_required
|
||||||
from django.shortcuts import redirect, render
|
from django.shortcuts import redirect, render
|
||||||
|
|
||||||
from .forms import ProjectForm, ProjectProgrammingLanguageFormSet
|
from .forms import (ProjectForm, ProjectHostingPlatformFormSet,
|
||||||
|
ProjectProgrammingLanguageFormSet)
|
||||||
from .models import Project
|
from .models import Project
|
||||||
|
|
||||||
|
|
||||||
@ -19,8 +20,9 @@ def add_project(request):
|
|||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
project_form = ProjectForm(request.POST)
|
project_form = ProjectForm(request.POST)
|
||||||
language_formset = ProjectProgrammingLanguageFormSet(request.POST, instance=Project())
|
language_formset = ProjectProgrammingLanguageFormSet(request.POST, instance=Project())
|
||||||
|
host_formset = ProjectHostingPlatformFormSet(request.POST, instance=Project())
|
||||||
|
|
||||||
if project_form.is_valid() and language_formset.is_valid():
|
if project_form.is_valid() and language_formset.is_valid() and host_formset.is_valid():
|
||||||
project = project_form.save(commit=False)
|
project = project_form.save(commit=False)
|
||||||
project.author = request.user
|
project.author = request.user
|
||||||
project.save()
|
project.save()
|
||||||
@ -28,15 +30,20 @@ def add_project(request):
|
|||||||
language_formset.instance = project
|
language_formset.instance = project
|
||||||
language_formset.save()
|
language_formset.save()
|
||||||
|
|
||||||
|
host_formset.instance = project
|
||||||
|
host_formset.save()
|
||||||
|
|
||||||
project_form.save_m2m()
|
project_form.save_m2m()
|
||||||
return redirect("/")
|
return redirect("/")
|
||||||
else:
|
else:
|
||||||
project_form = ProjectForm()
|
project_form = ProjectForm()
|
||||||
language_formset = ProjectProgrammingLanguageFormSet()
|
language_formset = ProjectProgrammingLanguageFormSet()
|
||||||
|
host_formset = ProjectHostingPlatformFormSet()
|
||||||
|
|
||||||
context = {
|
context = {
|
||||||
"title": "Add project",
|
"title": "Add project",
|
||||||
"project_form": project_form,
|
"project_form": project_form,
|
||||||
"language_formset": language_formset
|
"language_formset": language_formset,
|
||||||
|
"host_formset": host_formset,
|
||||||
}
|
}
|
||||||
return render(request, "fossdb/add_project.html", context)
|
return render(request, "fossdb/add_project.html", context)
|
||||||
|
|||||||
@ -16,6 +16,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
{{ host_formset.as_p }}
|
||||||
<button type="submit">Post</button>
|
<button type="submit">Post</button>
|
||||||
</form>
|
</form>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user