Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 22:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

V2 Fix redirect issues in HRApps (#951)

Browse Source 
Fix redirect issues in HRApps
Allow HR managers to delete reviewed apps
This commit is contained in:
ghoti 2018-01-11 19:06:10 -05:00 committed by Adarnof
parent f70987de09
commit 4d8baf1af0
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
allianceauth/hrapplications/templates/hrapplications/management.html
View File

@ -154,6 +154,12 @@
class="btn btn-primary"> class="btn btn-primary">
<span class="glyphicon glyphicon-eye-open"></span> <span class="glyphicon glyphicon-eye-open"></span>
</a> </a>
{% if perms.hrapplications.delete_application %}
<a href="(% url 'hrapplications:remove' app.id %}"
class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

12
allianceauth/hrapplications/views.py
View File

@ -67,7 +67,7 @@ def hr_application_create_view(request, form_id=None):
"")) ""))
response.save() response.save()
logger.info("%s created %s" % (request.user, application)) logger.info("%s created %s" % (request.user, application))
return redirect('hrapplications:view') return redirect('hrapplications:personal_view', application.id)
else: else:
questions = app_form.questions.all() questions = app_form.questions.all()
return render(request, 'hrapplications/create.html', return render(request, 'hrapplications/create.html',
@ -95,7 +95,7 @@ def hr_application_personal_view(request, app_id):
return render(request, 'hrapplications/view.html', context=context) return render(request, 'hrapplications/view.html', context=context)
else: else:
logger.warn("User %s not authorized to view %s" % (request.user, app)) logger.warn("User %s not authorized to view %s" % (request.user, app))
return redirect('hrapplications:view') return redirect('hrapplications:personal_view')
@login_required @login_required
@ -110,7 +110,7 @@ def hr_application_personal_removal(request, app_id):
logger.warn("User %s attempting to delete reviewed app %s" % (request.user, app)) logger.warn("User %s attempting to delete reviewed app %s" % (request.user, app))
else: else:
logger.warn("User %s not authorized to delete %s" % (request.user, app)) logger.warn("User %s not authorized to delete %s" % (request.user, app))
return redirect('hrapplications:view') return redirect('hrapplications:index')
@login_required @login_required
@ -158,7 +158,7 @@ def hr_application_remove(request, app_id):
logger.info("User %s deleting %s" % (request.user, app)) logger.info("User %s deleting %s" % (request.user, app))
app.delete() app.delete()
notify(app.user, "Application Deleted", message="Your application to %s was deleted." % app.form.corp) notify(app.user, "Application Deleted", message="Your application to %s was deleted." % app.form.corp)
return redirect('hrapplications:view') return redirect('hrapplications:index')
@login_required @login_required
@ -175,7 +175,7 @@ def hr_application_approve(request, app_id):
level="success") level="success")
else: else:
logger.warn("User %s not authorized to approve %s" % (request.user, app)) logger.warn("User %s not authorized to approve %s" % (request.user, app))
return redirect('hrapplications:view') return redirect('hrapplications:index')
@login_required @login_required
@ -192,7 +192,7 @@ def hr_application_reject(request, app_id):
level="danger") level="danger")
else: else:
logger.warn("User %s not authorized to reject %s" % (request.user, app)) logger.warn("User %s not authorized to reject %s" % (request.user, app))
return redirect('hrapplications:view') return redirect('hrapplications:index')
@login_required @login_required