ubccr#294: Allocation change request update form complete

brisco17 · Dec 22, 2021 · a94ccc1 · a94ccc1
1 parent 3754bac
commit a94ccc1
Show file tree

Hide file tree

Showing 4 changed files with 254 additions and 97 deletions.
diff --git a/coldfront/core/allocation/forms.py b/coldfront/core/allocation/forms.py
@@ -199,9 +199,29 @@ def clean(self):
  allocation_attribute.clean()
 
 
+class AllocationAttributeUpdateForm(forms.Form):
+ change_pk = forms.IntegerField(required=False, disabled=True)
+ attribute_pk = forms.IntegerField(required=False, disabled=True)
+ name = forms.CharField(max_length=150, required=False, disabled=True)
+ value = forms.CharField(max_length=150, required=False, disabled=True)
+ new_value = forms.CharField(max_length=150, required=False, disabled=False)
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.fields['change_pk'].widget = forms.HiddenInput()
+ self.fields['attribute_pk'].widget = forms.HiddenInput()
+
+ def clean(self):
+ cleaned_data = super().clean()
+ allocation_attribute = AllocationAttribute.objects.get(pk=cleaned_data.get('attribute_pk'))
+
+ allocation_attribute.value = cleaned_data.get('new_value')
+ allocation_attribute.clean()
+
+
 class AllocationChangeForm(forms.Form):
  EXTENSION_CHOICES = [
- (0, "----")
+ (0, "No Extension")
  ]
  for choice in ALLOCATION_CHANGE_REQUEST_EXTENSION_DAYS:
  EXTENSION_CHOICES.append((choice, "{} days".format(choice)))

diff --git a/coldfront/core/allocation/templates/allocation/allocation_change_detail.html b/coldfront/core/allocation/templates/allocation/allocation_change_detail.html
@@ -140,7 +140,7 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Alloc
  <td>{{form.value.value}}</td>
  <td>
  {{form.new_value}}
- <a href="" class="float-right">
+ <a href="{% url 'allocation-attribute-change-delete' form.change_pk.value %}" class="float-right confirm-delete">
  <i class="far fa-trash-alt fa-lg"></i>
  </a>
  </td>
@@ -206,4 +206,10 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Actio
  {% endif %}
  <br>
 
+<script>
+ $(document).on('click', '.confirm-delete', function(){
+ return confirm('Are you sure you want to delete this requested allocation attribute change?');
+ })
+</script>
 {% endblock %}
+
diff --git a/coldfront/core/allocation/urls.py b/coldfront/core/allocation/urls.py
@@ -18,6 +18,8 @@
  name='allocation-activate-change'),
  path('<int:pk>/deny-change-request', allocation_views.AllocationChangeDenyView.as_view(),
  name='allocation-deny-change'),
+ path('<int:pk>/delete-attribute-change', allocation_views.AllocationChangeDeleteAttributeView.as_view(),
+ name='allocation-attribute-change-delete'),
  path('<int:pk>/add-users', allocation_views.AllocationAddUsersView.as_view(),
  name='allocation-add-users'),
  path('<int:pk>/remove-users', allocation_views.AllocationRemoveUsersView.as_view(),