Skip to content
Snippets Groups Projects
Commit 0992fa33 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

privilege for adding new subject implemented

parent 6d27a6ed
No related branches found
No related tags found
1 merge request!234Resolve "add privilege for adding subjects"
Pipeline #24467 failed
# -*- coding: utf-8 -*-
# Generated by Django 1.11.5 on 2020-03-19 13:01
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('web', '0153_auto_20200320_0932'),
]
operations = [
migrations.RunSQL("insert into web_workerstudyrole_permissions(workerstudyrole_id, permission_id) "
"select web_workerstudyrole.id, auth_permission.id from web_workerstudyrole,auth_permission "
"where codename='add_subject';"),
]
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
padding-left: 2px; padding-left: 2px;
} }
.visit_row > span > a{ .visit_row > span > a{
color: inherit; color: inherit;
} }
.appointment_type_list{ .appointment_type_list{
margin-top: 10px; margin-top: 10px;
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
{% block maincontent %} {% block maincontent %}
<div> <div>
<a href="{% url 'web.views.subject_add' %}" class="btn btn-app"> <a href="{% url 'web.views.subject_add' %}" class="btn btn-app"
{% if not "add_subject" in permissions %}
disabled
{% endif %}
>
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new subject Add new subject
</a> </a>
......
...@@ -4,6 +4,7 @@ import logging ...@@ -4,6 +4,7 @@ import logging
from django.contrib import messages from django.contrib import messages
from django.shortcuts import redirect, get_object_or_404 from django.shortcuts import redirect, get_object_or_404
from web.decorators import PermissionDecorator
from . import wrap_response from . import wrap_response
from ..forms import VisitDetailForm, SubjectAddForm, SubjectEditForm, StudySubjectAddForm, StudySubjectEditForm from ..forms import VisitDetailForm, SubjectAddForm, SubjectEditForm, StudySubjectAddForm, StudySubjectEditForm
from ..models import StudySubject, MailTemplate, Worker, Study, Provenance, Subject from ..models import StudySubject, MailTemplate, Worker, Study, Provenance, Subject
...@@ -27,6 +28,7 @@ def subjects(request): ...@@ -27,6 +28,7 @@ def subjects(request):
return subject_list(request, SUBJECT_LIST_GENERIC) return subject_list(request, SUBJECT_LIST_GENERIC)
@PermissionDecorator('add_subject', 'subject')
def subject_add(request): def subject_add(request):
study = Study.objects.filter(id=GLOBAL_STUDY_ID)[0] study = Study.objects.filter(id=GLOBAL_STUDY_ID)[0]
if request.method == 'POST': if request.method == 'POST':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment