diff --git a/partners/admin.py b/partners/admin.py index 6295519faa26f5bee354818f25a827375b6b3a94..2b1ddd057b5450a624f52bfba070d5de1bc36f56 100644 --- a/partners/admin.py +++ b/partners/admin.py @@ -11,13 +11,8 @@ class PartnerAdmin(admin.ModelAdmin): search_fields = ['institution', 'institution_acronym', 'institution_address', 'contact_person'] -admin.site.register(Partner, PartnerAdmin) - +admin.site.register(Partner, PartnerAdmin) admin.site.register(Consortium) - - admin.site.register(ProspectivePartner) - - admin.site.register(MembershipAgreement) diff --git a/partners/forms.py b/partners/forms.py index f53c3844c01dddb68c23f2eeef32489bcdb67001..3aa5ed7fe1168577f6b676b20755236600e105d2 100644 --- a/partners/forms.py +++ b/partners/forms.py @@ -20,6 +20,7 @@ class PartnerForm(forms.ModelForm): super(PartnerForm, self).__init__(*args, **kwargs) self.fields['institution_address'].widget = forms.Textarea({'rows': 8, }) + class ProspectivePartnerForm(forms.ModelForm): class Meta: model = ProspectivePartner diff --git a/partners/models.py b/partners/models.py index 123b99d4cd07a9975a0fc80964068f4264e85fe3..82450ab9946f58536bb1892d64b2d97b3a296401 100644 --- a/partners/models.py +++ b/partners/models.py @@ -8,7 +8,6 @@ from .constants import PARTNER_TYPES, PARTNER_STATUS, CONSORTIUM_STATUS,\ MEMBERSHIP_AGREEMENT_STATUS, MEMBERSHIP_DURATION from scipost.constants import TITLE_CHOICES -from scipost.models import Contributor class ContactPerson(models.Model): @@ -62,7 +61,6 @@ class Consortium(models.Model): verbose_name_plural = 'consortia' - class ProspectivePartner(models.Model): """ Created from the membership_request page, after submitting a query form. diff --git a/partners/urls.py b/partners/urls.py index 3c3dd7ebb828f446978d61c6ef781ae3a84b273f..5558aaaed1659597f7511d16fc50b80acc947868 100644 --- a/partners/urls.py +++ b/partners/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.conf.urls import url from . import views diff --git a/partners/views.py b/partners/views.py index dd338e2325feb3b488c6a96c8f94d608eccd5704..7473a5352a699f7b2c940ad97dcffaab3554fd68 100644 --- a/partners/views.py +++ b/partners/views.py @@ -1,12 +1,12 @@ -from django.contrib.auth.decorators import login_required from django.contrib import messages from django.shortcuts import render, reverse, redirect from django.utils import timezone from guardian.decorators import permission_required -from .models import Partner, Consortium, ProspectivePartner, MembershipAgreement -from .forms import PartnerForm, ProspectivePartnerForm, MembershipQueryForm +from .models import Partner, ProspectivePartner, MembershipAgreement +from .forms import ProspectivePartnerForm, MembershipQueryForm + def supporting_partners(request): prospective_agreements = MembershipAgreement.objects.filter( @@ -34,7 +34,7 @@ def membership_request(request): 'with further details.') context = {'ack_message': ack_message, } return render(request, 'scipost/acknowledgement.html', context) - context = {'query_form': query_form,} + context = {'query_form': query_form} return render(request, 'partners/membership_request.html', context) @@ -57,8 +57,8 @@ def manage(request): def add_prospective_partner(request): form = ProspectivePartnerForm(request.POST or None) if form.is_valid(): - pros_partner = form.save() + form.save() messages.success(request, 'Prospective Partners successfully added') return redirect(reverse('partners:manage')) - context = {'form': form,} + context = {'form': form} return render(request, 'partners/add_prospective_partner.html', context) diff --git a/production/admin.py b/production/admin.py index b20b4a415911ba3ce9e480be1f54844dd858f54b..41ae12e06e49ec6a43fc034ed520b5708e3b2ff0 100644 --- a/production/admin.py +++ b/production/admin.py @@ -4,6 +4,4 @@ from .models import ProductionStream, ProductionEvent admin.site.register(ProductionStream) - - admin.site.register(ProductionEvent) diff --git a/production/constants.py b/production/constants.py index 8a1ba8ea803044b2320086ced3e2f1e726a369da..63d9f65fef9e6df30ea6af26cb5767a5fa46bec8 100644 --- a/production/constants.py +++ b/production/constants.py @@ -1,5 +1,3 @@ - - PRODUCTION_STREAM_STATUS = ( ('ongoing', 'Ongoing'), ('completed', 'Completed'), diff --git a/production/forms.py b/production/forms.py index d783973ecf3be8bbda9a5ca542691260aa755305..9f47ebe6755bf04607cf9f15f4515f73d7d090f0 100644 --- a/production/forms.py +++ b/production/forms.py @@ -8,6 +8,6 @@ class ProductionEventForm(forms.ModelForm): model = ProductionEvent exclude = ['stream', 'noted_on', 'noted_by'] widgets = { - 'comments': forms.Textarea(attrs={'rows': 4,}), + 'comments': forms.Textarea(attrs={'rows': 4}), 'duration': forms.TextInput(attrs={'placeholder': 'HH:MM:SS'}) } diff --git a/production/models.py b/production/models.py index 8badf3eeac4fa5df70ac52dfc24feebff4225391..c2cb30209aa2153f2c6b3e2365ce3e1dd6fd2b95 100644 --- a/production/models.py +++ b/production/models.py @@ -1,7 +1,7 @@ from django.db import models from django.utils import timezone -from .constants import PRODUCTION_STREAM_STATUS, PRODUCTION_EVENTS +from .constants import PRODUCTION_EVENTS from scipost.models import Contributor diff --git a/production/views.py b/production/views.py index 8103f5fdbad18954c5a9712147301b502dc2986e..4093d7751d30398ce87f78f36b3482b1b5dae76f 100644 --- a/production/views.py +++ b/production/views.py @@ -9,7 +9,6 @@ from .models import ProductionStream, ProductionEvent from .forms import ProductionEventForm from submissions.models import Submission -from scipost.models import Contributor ###################### @@ -33,6 +32,7 @@ def production(request): } return render(request, 'production/production.html', context) + @permission_required('scipost.can_view_production', return_403=True) @transaction.atomic def add_event(request, stream_id): @@ -57,8 +57,6 @@ def add_event(request, stream_id): return render(request, 'scipost/error.html', {'errormessage': errormessage}) - - def upload_proofs(request): """ TODO