Merge pull request #367 from fasrc/cp_allocationuseredit_hotfix

merge is_allowed_to_update_project with user_can_manage_allocation

Author: claire-peters

coldfront/core/allocation/models.py

@@ -540,6 +540,12 @@ def user_permissions(self, user):
         if ProjectPermission.DATA_MANAGER in project_perms:
             return [AllocationPermission.USER, AllocationPermission.MANAGER]
 
+        managed_resources = [
+            resource for resource in self.resources.all() if user in resource.allowed_users.all()]
+
+        if managed_resources:
+            return [AllocationPermission.USER, AllocationPermission.MANAGER]
+
         if self.project.projectuser_set.filter(user=user, status__name='Active').exists():
             return [AllocationPermission.USER]
         if self.allocationuser_set.filter(user=user, status__name__in=['Active', 'New']).exists():
@@ -561,13 +567,8 @@ def has_perm(self, user, perm):
         return perm in perms
 
     def user_can_manage_allocation(self, user):
-        is_manager = False
-        if self.project.pi == user:
-            is_manager = True
-        for resource in self.resources.all():
-            if resource.user_can_manage_resource(user):
-                is_manager = True
-        return is_manager
+        return self.has_perm(user, AllocationPermission.MANAGER)
+
 
     def __str__(self):
         tmp = self.get_parent_resource

coldfront/core/allocation/templates/allocation/allocation_detail.html

@@ -50,7 +50,7 @@ <h2>Allocation Detail</h2>
       <div class="col">
         <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
       </div>
-      {% if allocation.is_changeable and not allocation.is_locked and is_allowed_to_update_project and allocation.status.name in 'Active, Renewal Requested, Payment Pending, Payment Requested, Paid' and 'Cluster' not in allocation.get_parent_resource.resource_type.name %}
+      {% if allocation.is_changeable and not allocation.is_locked and user_can_manage_allocation and allocation.status.name in 'Active, Renewal Requested, Payment Pending, Payment Requested, Paid' and 'Cluster' not in allocation.get_parent_resource.resource_type.name %}
         <div class="col">
           <a class="btn btn-primary" href="{% url 'allocation-change' allocation.pk %}" role="button" style="float: right;">
             Request Change
@@ -210,7 +210,7 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
                   <i class="far fa-clock" aria-hidden="true"></i>
                   Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} - Not renewable
                 </span>
-              {% elif is_allowed_to_update_project and ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
+              {% elif user_can_manage_allocation and ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
                 <a href="{% url 'allocation-renew' allocation.pk %}">
                   <span class="badge badge-warning">
                     <i class="fas fa-redo-alt" aria-hidden="true"></i>
@@ -409,7 +409,7 @@ <h4 class="card-title">{{attribute}}</h4>
     <h3 class="d-inline">
       <i class="fas fa-info-circle" aria-hidden="true"></i> Allocation Change Requests
     </h3> <span class="badge badge-secondary">{{allocation_changes.count}}</span>
-    {% if allocation.is_changeable and not allocation.is_locked and is_allowed_to_update_project and allocation.status.name in 'Active, Renewal Requested, Payment Pending, Payment Requested, Paid' %}
+    {% if allocation.is_changeable and not allocation.is_locked and user_can_manage_allocation and allocation.status.name in 'Active, Renewal Requested, Payment Pending, Payment Requested, Paid' %}
       <a class="btn btn-primary" href="{% url 'allocation-change' allocation.pk %}" role="button" style="float: right;">
         Request Change
       </a>
@@ -473,7 +473,7 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
       <span class="last_sync_users">Last Sync: {{user_sync_dt}}</span>
     {% endif %}
     <div class="float-right">
-      {% if allocation.project.status.name != 'Archived' and is_allowed_to_update_project and allocation.status.name in 'Active,New,Renewal Requested' and user_can_manage_allocation and allocation.is_cluster_allocation %}
+      {% if allocation.project.status.name != 'Archived' and allocation.status.name in 'Active,New,Renewal Requested' and user_can_manage_allocation and allocation.is_cluster_allocation %}
         <a class="btn btn-success" href="{% url 'allocation-add-users' allocation.pk %}" role="button">
           <i class="fas fa-user-plus" aria-hidden="true"></i> Add Users
         </a>

coldfront/core/allocation/templates/allocation/allocation_invoice_detail.html

@@ -168,7 +168,7 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Usage Summary For: {{ allocat
     <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Allocation</h3>
     <span class="badge badge-secondary">{{allocation_users.count}}</span>
     {% comment %} <div class="float-right">
-      <!-- {% if allocation.project.status.name != 'Archived' and is_allowed_to_update_project and allocation.status.name in 'Active,New,Renewal Requested' %}
+      <!-- {% if allocation.project.status.name != 'Archived' and user_can_manage_allocation and allocation.status.name in 'Active,New,Renewal Requested' %}
         <a class="btn btn-success" href="{% url 'allocation-add-users' allocation.pk %}" role="button">
           <i class="fas fa-user-plus" aria-hidden="true"></i> Add Users
         </a>

coldfront/core/allocation/templates/allocation/allocation_user_attributes_edit.html

@@ -121,7 +121,7 @@ <h2>Edit User Attributes for {{allocation.project.title}} {{allocation.get_paren
 
             </table>
           </form>
-          {% if is_allowed_to_update_project and request.user.is_superuser %}
+          {% if user_can_manage_allocation and request.user.is_superuser %}
             <div class="text-left">
               <a class="btn btn-secondary" href="{% url 'allocation-detail' allocation.pk %}" role="button">
                 <i class="fas fa-long-arrow-left" aria-hidden="true"></i>

coldfront/core/allocation/views.py

@@ -267,19 +267,14 @@ def get_context_data(self, **kwargs):
         context['attributes'] = attributes
         context['allocation_changes'] = allocation_changes
 
-        # Can the user update the project?
-        project_update_perm = allocation_obj.project.has_perm(
-            self.request.user, ProjectPermission.DATA_MANAGER
-        )
-        context['is_allowed_to_update_project'] = project_update_perm
+        context['user_can_manage_allocation'] = allocation_obj.user_can_manage_allocation(self.request.user)
         context['allocation_non_project_users'] = allocation_obj.get_non_project_users
         non_project_users_list = [allocation_user.user for allocation_user in context['allocation_non_project_users']]
         context['allocation_users'] = allocation_users.exclude(user__in=non_project_users_list)
         context['note_update_link'] = 'allocation-note-update'
 
         context['notes'] = self.return_visible_notes(allocation_obj)
         context['ALLOCATION_ENABLE_ALLOCATION_RENEWAL'] = ALLOCATION_ENABLE_ALLOCATION_RENEWAL
-        context['user_can_manage_allocation'] = allocation_obj.user_can_manage_allocation(self.request.user)
         return context
 
     def return_visible_notes(self, allocation_obj):
@@ -1397,11 +1392,7 @@ def get_context_data(self, **kwargs):
         inactive_status = AllocationUserStatusChoice.objects.get(name='Removed')
         allocation_users = allocation_obj.allocationuser_set.exclude(status=inactive_status).order_by('user__username')
 
-        # Can the user update the project?
-        project_update_perm = allocation_obj.project.has_perm(
-            self.request.user, ProjectPermission.DATA_MANAGER
-        )
-        context['is_allowed_to_update_project'] = project_update_perm
+        context['user_can_manage_allocation'] = allocation_obj.user_can_manage_allocation(self.request.user)
         context['allocation_users'] = allocation_users
         context['allocation'] = allocation_obj
         return context
@@ -1834,7 +1825,7 @@ def get_context_data(self, **kwargs):
         project_update_perm = allocation_obj.project.has_perm(
             self.request.user, ProjectPermission.DATA_MANAGER
         )
-        context['is_allowed_to_update_project'] = project_update_perm
+        context['user_can_manage_allocation'] = allocation_obj.user_can_manage_allocation(self.request.user)
         context['allocation_users'] = allocation_users
         context['note_update_link'] = 'allocation-note-update'