Remove deletion part, cleanup

froide_govplan/admin.py

@@ -208,8 +208,6 @@ class GovernmentPlanAdmin(admin.ModelAdmin):
             form = GovernmentPlanUpdateAcceptProposalForm(data=data, plan=obj)
             if form.is_valid():
                 update = form.save(
-                    delete_unconfirmed=request.POST.get("delete", "0") == "1",
-                    delete_reason=request.POST.get("delete_reason", ""),
                     proposal_id=proposal_id,
                     delete_proposals=request.POST.getlist("proposal_delete"),
                 )

froide_govplan/forms.py

@@ -162,12 +162,7 @@ class GovernmentPlanUpdateAcceptProposalForm(GovernmentPlanUpdateProposalForm):
         self,
         proposal_id=None,
         delete_proposals=None,
-        delete_unconfirmed=False,
-        delete_reason="",
     ):
-        import ipdb
-
-        ipdb.set_trace()
         update = super(forms.ModelForm, self).save(commit=False)
         update.plan = self.plan
 
@@ -177,17 +172,6 @@ class GovernmentPlanUpdateAcceptProposalForm(GovernmentPlanUpdateProposalForm):
             proposals = self.get_proposals()
             proposal_user = proposals[proposal_id]["user"]
             update.user = proposal_user
-            # if proposal_user != user:
-            # proposal_user.send_mail(
-            #     _("Changes to public body “{}” have been applied").format(pb.name),
-            #     _(
-            #         "Hello,\n\nYou can find the changed public body here:"
-            #         "\n\n{url}\n\nAll the Best,\n{site_name}"
-            #     ).format(
-            #         url=pb.get_absolute_domain_url(), site_name=settings.SITE_NAME
-            #     ),
-            #     priority=False,
-            # )
             delete_proposals.append(proposal_id)
         for pid in delete_proposals:
             if pid in self.plan.proposals:
@@ -196,32 +180,5 @@ class GovernmentPlanUpdateAcceptProposalForm(GovernmentPlanUpdateProposalForm):
             self.plan.proposals = None
         self.plan.save(update_fields=["proposals"])
 
-        # if delete_unconfirmed:
-        #     self.delete_proposal(pb, user, delete_reason)
-        #     return None
-
         update.save()
-        # PublicBody.change_proposal_accepted.send(sender=pb, user=user)
         return update
-
-    # def delete_proposal(self, pb, user, delete_reason=""):
-    #     LogEntry.objects.log_action(
-    #         user_id=user.id,
-    #         content_type_id=ContentType.objects.get_for_model(pb).pk,
-    #         object_id=pb.pk,
-    #         object_repr=str(pb),
-    #         action_flag=DELETION,
-    #     )
-
-    #     creator = pb.created_by
-    #     if creator:
-    #         creator.send_mail(
-    #             _("Your public body proposal “%s” was rejected") % pb.name,
-    #             _(
-    #                 "Hello,\n\nA moderator has rejected your proposal for a new "
-    #                 "public body.\n\n{delete_reason}\n\nAll the Best,\n{site_name}"
-    #             ).format(delete_reason=delete_reason, site_name=settings.SITE_NAME),
-    #             priority=False,
-    #         )
-    #     PublicBody.proposal_rejected.send(sender=pb, user=user)
-    #     pb.delete()

froide_govplan/templates/froide_govplan/admin/accept_proposal.html

@@ -15,19 +15,5 @@
     <div class="submit-row">
       <input type="submit" value="{% trans 'Create update draft' %}" style="float:left"/>
     </div>
-
-    <div class="card border-danger mt-3">
-      <div class="card-body">
-        <h3>{% trans "Delete proposal" %}</h3>
-        <p><label for="delete_reason">
-          {% trans "Please give a reason for not accepting this proposal. It will be send to the user who made the proposal." %}
-        </label>
-        <p>
-        <p><textarea id="delete_reason" class="form-control" name="delete_reason" placeholder="{% trans 'We could not accept this update because...' %}"></textarea></p>
-        <p><button class="mt-2 btn btn-danger float-right" type="submit" name="delete" value="1">
-          {% trans "Delete proposed update" %}
-        </button></p>
-      </div>
-    </div>
   </form>
   {% endblock %}