Merge pull request #330 from orbitroom/master

Fixed Bug #329
This commit is contained in:
Mr McClain 2016-03-25 13:00:57 -05:00
commit ad7ace872f
2 changed files with 2 additions and 2 deletions

View File

@ -113,7 +113,7 @@ def hr_application_personal_removal(request, app_id):
logger.debug("hr_application_personal_removal called by user %s for app id %s" % (request.user, app_id))
app = get_object_or_404(Application, pk=app_id)
if app.user == request.user:
if app.accepted == None:
if app.approved == None:
logger.info("User %s deleting %s" % (request.user, app))
app.delete()
else:

View File

@ -45,7 +45,7 @@
class="glyphicon glyphicon-eye-open"></span></button>
</a>
{% if personal_app.approved_denied == None %}
{% if personal_app.approved == None %}
<a href="/hr_application_personal_removal/{{ personal_app.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>