This commit is contained in:
xieshen 2021-07-23 11:54:41 +08:00
parent cbf3e87e00
commit c8c3e71dd9
2 changed files with 23 additions and 10 deletions

View File

@ -17,7 +17,7 @@
<div class="row">
<div class="col-md-12" style="margin-top: 15px;">
{% if user.is_authenticated and messages %}
<div class="alert alert-danger alert-dismissible" role="alert" style="height: 300px">
<div class="alert alert-danger alert-dismissible" role="alert" style="height: 50px">
<button type="button " class="close btn-default" data-dismiss="alert" style="">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>

View File

@ -1719,34 +1719,47 @@ def my_order_3(request):
@login_required
def my_contribute_0(request):
user = request.user
assessor = Assessor.objects.get(assessor_id=user.id)
administrator = Administrator.objects.get(administrator_id=user.id)
d = Distributions.objects.get(user_id=user.id)
if Assessor.objects.filter(assessor_id=user.id):
assessor = Assessor.objects.get(assessor_id=user.id)
administrator = Administrator.objects.get(administrator_id=user.id)
metadata = Metadata.objects.filter(status=0, authors_id=d.id)
return render(request, 'manages/my_contribute_0.html',
{'metadata': metadata, 'assessor': assessor, 'administrator': administrator, 'd': d})
metadata = Metadata.objects.filter(status=0, authors_id=d.id)
return render(request, 'manages/my_contribute_0.html',
{'metadata': metadata, 'assessor': assessor, 'administrator': administrator, 'd': d})
{'metadata': metadata,'d': d})
@login_required
def my_contribute_1(request):
user = request.user
d = Distributions.objects.get(user_id=user.id)
assessor = Assessor.objects.get(assessor_id=user.id)
administrator = Administrator.objects.get(administrator_id=user.id)
if Assessor.objects.filter(assessor_id=user.id):
assessor = Assessor.objects.get(assessor_id=user.id)
administrator = Administrator.objects.get(administrator_id=user.id)
metadata = Metadata.objects.filter(status=1, authors_id=d.id)
return render(request, 'manages/my_contribute_1.html',
{'metadata': metadata, 'assessor': assessor, 'administrator': administrator, 'd': d})
metadata = Metadata.objects.filter(status=1, authors_id=d.id)
return render(request, 'manages/my_contribute_1.html',
{'metadata': metadata, 'assessor': assessor, 'administrator': administrator, 'd': d})
{'metadata': metadata, 'd': d})
@login_required
def my_contribute_2(request):
user = request.user
d = Distributions.objects.get(user_id=user.id)
assessor = Assessor.objects.get(assessor_id=user.id)
administrator = Administrator.objects.get(administrator_id=user.id)
if Assessor.objects.filter(assessor_id=user.id).count() > 0:
assessor = Assessor.objects.get(assessor_id=user.id)
administrator = Administrator.objects.get(administrator_id=user.id)
metadata = Metadata.objects.filter(status=2, authors_id=d.id)
return render(request, 'manages/my_contribute_2.html',
{'metadata': metadata, 'assessor': assessor, 'administrator': administrator, 'd': d})
metadata = Metadata.objects.filter(status=2, authors_id=d.id)
return render(request, 'manages/my_contribute_2.html',
{'metadata': metadata, 'assessor': assessor, 'administrator': administrator, 'd': d})
{'metadata': metadata, 'd': d})
# 审核申请筛选