improving user actions checking for user_manager and obsconfig

Alexis Koralewski
1 parent aaf35888
Showing 6 changed files with 63 additions and 42 deletions Show diff stats
src/core/pyros_django/dashboard/templates/dashboard/settings.html
src/core/pyros_django/dashboard/views.py
src/core/pyros_django/user_manager/templates/user_manager/user_detail.html
src/core/pyros_django/user_manager/templates/user_manager/user_detail_edit.html
src/core/pyros_django/user_manager/templates/user_manager/users_management.html
src/core/pyros_django/user_manager/views.py
@@ -85,7 +85,7 @@
 <div class="setting-section">
 	<ul class="setting-grid">
  
-        {% if USER_LEVEL|ifinlist:"Admin,Unit-PI" %}
+        {% if USER_LEVEL|ifinlist:"Admin,Unit-PI,Unit-board" %}
     {% comment %}
             <li>
                 <div class="setting-box setting-img-system">
@@ -169,8 +169,7 @@ def settings(request):
     '''
         View called to see the settings (for the software, observatory, users...) page
     '''
-    USER_LEVEL = request.user.get_priority()
-
+    CAN_VIEW_PERIOD = request.session.get("role") in ("Admin", "Unit-PI", "Observer", "Unit-board")
     return(render(request, "dashboard/settings.html", locals()))
  
 def retrieve_main_icon(request):
@@ -54,33 +54,36 @@
     <p><strong>Quota : </strong>{{ user.quota }}</p>
     {% endcomment %}
     {% if scientific_programs|length > 0 %}
-    <p><strong>Scientific Program(s) : </strong>  <table class="table table-bordered table-hover table-striped" style="font-family: 'Montserra', sans-serif;">
-        
-        <thead>
-            <tr>
-                <th>Scientific Program</th>
-            </tr>
-        </thead>
-        
-    <tbody>
-     {% for sp in scientific_programs %}
-     <tr>
-        <td> <a href="{% url "detail_scientific_program" sp.pk %}">{{ sp }}  </a></td>
-    </tr>
-    {% endfor %}
-    </tbody>
-    </table></p>
+        <p><strong>Scientific Program(s) : </strong>  <table class="table table-bordered table-hover table-striped" style="font-family: 'Montserra', sans-serif;">
+            
+            <thead>
+                <tr>
+                    <th>Scientific Program</th>
+                </tr>
+            </thead>
+            
+        <tbody>
+        {% for sp in scientific_programs %}
+        <tr>
+            <td> <a href="{% url "detail_scientific_program" sp.pk %}">{{ sp }}  </a></td>
+        </tr>
+        {% endfor %}
+        </tbody>
+        </table></p>
     {% endif %}
-    {% if current_user.id is user.id or USER_LEVEL|ifinlist:"Admin,Unit-PI,Unit board"%}
+    {% if CAN_VIEW_VALIDATOR %}
         <p><strong>Validator : </strong>{{ user.validator }}</p>
         {% if user.motive_of_registration|length > 0 %}
             <p><strong>Motive of registration : </strong>{{ user.motive_of_registration }}</p>
         {% endif %}
+    {% endif %}
+    {% if CAN_EDIT_USER %}
         <a href="{% url "user-edit" user.pk %}" class="btn btn-info" role="button">Edit</a>
-        {% if USER_LEVEL|ifinlist:"Admin,Unit-PI,Unit board" %}
-            {% if not is_last_user  or not user.is_superuser%}
-                <a href="{% url "change_activate" user.pk current_user.id %}" class="btn btn-danger" role="button">{% active_account user.pk %} </a>
-            {% endif %}
+    {% endif %}
+    {% if CAN_ACTIVATE_USER %}
+        <a href="{% url "change_activate" user.pk current_user.id %}" class="btn btn-danger" role="button">{% active_account user.pk %} </a>
+    {% endif %}
+    {% if CAN_DELETE_USER %}
             <button type="button" class="btn btn-danger open-modal" id="open_modal_delete">Delete</button>
             {# start of modal #}
             <div id="modal_delete">
@@ -101,7 +104,6 @@
             </div>
             {# end of modal #}
  
-        {% endif %}
     {% endif %}
     <a href="{% url "users" %}" class="btn btn-info" role="button">Return to list of users</a>
 {% endblock %}
 \ No newline at end of file
@@ -4,7 +4,7 @@
 <form id="siteForm" action="" method="post">
     {% csrf_token %}
     {{ form.as_p }}
-    {% if current_user.id is user.id or USER_LEVEL|ifinlist:"Admin,Unit-PI,Unit board" %}
+    {% if CAN_EDIT_ROLE %}
         <label> Roles : </label>
         {% for role in roles %}
             <br>
@@ -17,7 +17,7 @@
  
 <div id="div_users"class="row">
     <h3>List of active users </h3>
-    {% if user.get_priority >= 6 %}
+    {% if CAN_ADD_USER %}
         <a href="{% url "create_user"  %}" class="btn btn-info" role="button">Create new user </a>
     {% endif %}
     <div class="table-responsive">
@@ -146,16 +146,6 @@ def login_validation(request):
     error = True
     return(render(request, "user_manager/home_login.html", locals()))
  
-@login_required
-def profile(request):
-    '''
-        View called to see the current user profile
-    '''
-    #current_user = request.user
-    #USER_LEVEL = request.user.get_priority()
-    #if (current_user.get_priority() < 4):
-    #    return(render(request, "user_manager/user_detail.html", {'user': current_user, 'admin': 0}))
-    return(render(request, "user_manager/profile.html", locals()))
  
 @login_required
 def superoperator_return(request):
@@ -211,9 +201,17 @@ def users(request):
             for user in SP_Period_User.objects.filter(SP_Period=sp.SP_Period).exclude(user=current_user).values_list("user",flat=True):
                 pyros_users_with_roles.append(PyrosUser.objects.get(id=user))
     nb_of_scientific_program = ScientificProgram.objects.count()
+    CAN_ADD_USER = request.session.get("role") in ("Admin,Unit-PI,Unit board")
     # need the negative to calculate in the template for adjusting correctly the information display
     negative_nb_scientific_program = -nb_of_scientific_program
-    return render(request, 'user_manager/users_management.html', {'pyros_users_with_roles': pyros_users_with_roles,"inactive_pyros_users":inactive_pyros_users,"nb_of_scientific_program": nb_of_scientific_program,"negative_nb_scientific_program":negative_nb_scientific_program,"common_scientific_programs":common_scientific_programs})                     
+    return render(request, 'user_manager/users_management.html', {
+        'pyros_users_with_roles': pyros_users_with_roles,
+        "inactive_pyros_users":inactive_pyros_users,
+        "nb_of_scientific_program": nb_of_scientific_program,
+        "negative_nb_scientific_program":negative_nb_scientific_program,
+        "common_scientific_programs":common_scientific_programs,
+        "CAN_ADD_USER": CAN_ADD_USER
+    })                     
  
 @login_required
 @level_required("Admin","Unit-PI","Unit board")
@@ -256,17 +254,31 @@ def change_activate(request, pk, current_user_id):
 def user_detail_view(request,pk):
     try:
         is_last_user = PyrosUser.objects.count() == 1
-        user_id=PyrosUser.objects.get(pk=pk)
+        user=PyrosUser.objects.get(pk=pk)
         current_user = request.user
         roles = current_user.get_list_of_roles()
-        sp_periods = SP_Period_User.objects.filter(user=user_id)
+        sp_periods = SP_Period_User.objects.filter(user=user)
+        CAN_VIEW_VALIDATOR = request.user.id == pk or request.session.get("role") in ("Admin","Unit-PI","Unit-board")
+        CAN_DELETE_USER = not is_last_user and request.session.get("role") in ("Admin","Unit-PI","Unit-board") and not user.is_superuser 
+        CAN_ACTIVATE_USER = not is_last_user and request.session.get("role") in ("Admin","Unit-PI","Unit-board") and not user.is_superuser 
+        CAN_EDIT_USER = request.user.id == pk or request.session.get("role") in ("Admin","Unit-PI","Unit-board")
         scientific_programs = []
         for sp_period in sp_periods:
  
             scientific_programs.append(sp_period.SP_Period.scientific_program)
     except PyrosUser.DoesNotExist:
         raise Http404("User does not exist")
-    return render(request, 'user_manager/user_detail.html', context={'user' : user_id, 'current_user' : current_user, 'USER_LEVEL': request.user.get_priority(), 'is_last_user' : is_last_user,"roles" : roles,"scientific_programs":scientific_programs})
+    return render(request, 'user_manager/user_detail.html', context={
+        'user' : user,
+        'current_user' : current_user,
+        'is_last_user' : is_last_user,
+        "roles" : roles,
+        "scientific_programs":scientific_programs,
+        "CAN_VIEW_VALIDATOR": CAN_VIEW_VALIDATOR,
+        "CAN_DELETE_USER": CAN_DELETE_USER,
+        "CAN_ACTIVATE_USER": CAN_ACTIVATE_USER,
+        "CAN_EDIT_USER": CAN_EDIT_USER
+    })
  
 @login_required
 @level_required()
@@ -281,6 +293,7 @@ def user_detail_edit(request,pk):
     edit = get_object_or_404(PyrosUser, pk=pk)
     is_sp_pi = ScientificProgram.objects.filter(sp_pi=edit).count() > 0
     form = UserForm(request.POST or None, instance=edit)
+    CAN_EDIT_ROLE = request.session.get("role") in ("Admin","Unit-PI","Unit-board")
     # creating list of roles for the formular excluding visitor of the list
     roles = UserLevel.objects.exclude(name="Visitor")
     if form.is_valid():
@@ -302,7 +315,14 @@ def user_detail_edit(request,pk):
  
         obj.save()
         return redirect('user_detail', pk=pk)
-    return render(request, 'user_manager/user_detail_edit.html', {'form': form,"roles":roles, "pk":pk,"user_edit":edit,'USER_LEVEL': request.user.get_priority(),"is_sp_pi":is_sp_pi})
+    return render(request, 'user_manager/user_detail_edit.html', {
+        'form': form,
+        "roles":roles,
+        "pk":pk,
+        "user_edit":edit,
+        "is_sp_pi":is_sp_pi,
+        "CAN_EDIT_ROLE": CAN_EDIT_ROLE
+    })
  
  
 def set_active_role(request):