Merge branch 'master' into ranking_csv_file

judge/views/organization.py

@@ -1,4 +1,3 @@
-from itertools import chain
 from django import forms
 from django.conf import settings
 from django.contrib import messages
@@ -1037,7 +1036,7 @@ class EditOrganizationBlog(
     MemberOrganizationMixin,
     UpdateView,
 ):
-    template_name = "organization/blog/add.html"
+    template_name = "organization/blog/edit.html"
     model = BlogPost
 
     def get_form_class(self):
@@ -1063,6 +1062,10 @@ class EditOrganizationBlog(
                 _("Not allowed to edit this blog"),
             )
 
+    def delete_blog(self , request , *args , **kwargs):
+        self.blog_id = kwargs["blog_pk"]
+        BlogPost.objects.get(pk = self.blog_id).delete()
+
     def get(self, request, *args, **kwargs):
         res = self.setup_blog(request, *args, **kwargs)
         if res:
@@ -1073,6 +1076,12 @@ class EditOrganizationBlog(
         res = self.setup_blog(request, *args, **kwargs)
         if res:
             return res
+        if request.POST['action'] == 'Delete':
+            self.create_notification("Delete blog")
+            self.delete_blog(request , *args , **kwargs)
+            cur_url = reverse("organization_pending_blogs", args=(self.organization_id,self.organization.slug) )
+            return HttpResponseRedirect(cur_url)
+        else:
             return super().post(request, *args, **kwargs)
 
     def get_object(self):
@@ -1081,31 +1090,35 @@ class EditOrganizationBlog(
     def get_title(self):
         return _("Edit blog %s") % self.object.title
 
-    def form_valid(self, form):
-        with transaction.atomic(), revisions.create_revision():
-            res = super(EditOrganizationBlog, self).form_valid(form)
-            revisions.set_comment(_("Edited from site"))
-            revisions.set_user(self.request.user)
-
+    def create_notification(self,action):
+        blog = BlogPost.objects.get(pk=self.blog_id)
         link = reverse(
             "edit_organization_blog",
-                args=[self.organization.id, self.organization.slug, self.object.id],
+            args=[self.organization.id, self.organization.slug, self.blog_id],
         )
         html = (
-                f'<a href="{link}">{self.object.title} - {self.organization.name}</a>'
+            f'<a href="{link}">{blog.title} - {self.organization.name}</a>'
         )
-            for user in self.organization.admins.all():
+        post_authors = blog.authors.all()
+        posible_user = self.organization.admins.all() | post_authors
+        for user in posible_user:
             if user.id == self.request.profile.id:
                 continue
             notification = Notification(
                 owner=user,
                 author=self.request.profile,
-                    category="Edit blog",
+                category= action,
                 html_link=html,
             )
             notification.save()
-            return res
     
+    def form_valid(self, form):
+        with transaction.atomic(), revisions.create_revision():
+            res = super(EditOrganizationBlog, self).form_valid(form)
+            revisions.set_comment(_("Edited from site"))
+            revisions.set_user(self.request.user)
+            self.create_notification("Edit blog")
+            return res
 
 class PendingBlogs(
     LoginRequiredMixin,

resources/widgets.scss

@@ -100,6 +100,12 @@
             background: darkblue;
         }
     }
+
+    // class = "unselectable button full small" only appear in online-judge/templates/contest/list.html
+    // this attribute center buttons in contest list (including "Join", "Virutal Join", "Spectable")
+    &.unselectable.button.full.small {
+        margin: 0 auto
+    }
 }
 
 .button.full, input[type=submit].full, button.full {

templates/organization/blog/edit.html

@@ -0,0 +1,39 @@
+{% extends "organization/home-base.html" %}
+
+{% block three_col_js %}
+    {{ form.media.js }}
+    {% include "organization/home-js.html" %}
+{% endblock %}
+
+{% block three_col_media %}
+    {{ form.media.css }}
+{% endblock %}
+
+{% block middle_content %}
+<form action="" method="post">
+    {% csrf_token %}
+    {% if form.errors %}
+        <div class="alert alert-danger alert-dismissable">
+            <a href="#" class="close">x</a>
+                {{ form.non_field_errors() }}
+                {{ form.errors }}
+        </div>
+    {% endif %}
+    {% for field in form %}
+        {% if not field.is_hidden %}
+            <div style="margin-bottom: 1em;">
+                {{ field.errors }}
+                <label for="{{field.id_for_label }}"><b>{{ field.label }}{% if field.field.required %}<span style="color:red"> * </span>{% endif %}:</b> </label>
+                <div class="org-field-wrapper" id="org-field-wrapper-{{field.html_name }}">
+                    {{ field }}
+                </div>
+                {% if field.help_text %}
+                    <i style="display: block">{{ field.help_text|safe }}</i>
+                {% endif %}
+            </div>
+        {% endif %}
+    {% endfor %}
+    <button type="submit" style="display: inline;" name="action" value="Save" >{{ _('Save') }} </button>
+    <button type="submit" style="background-color: red; float: right;" name="action" value="Delete" > {{ _('Delete') }} </button>
+</form>
+{% endblock %}

templates/organization/form.html

@@ -21,5 +21,5 @@
             </div>
         {% endif %}
     {% endfor %}
-    <button type="submit">{{ _('Save') }}</button>
+    <button type="submit" style="display: inline;" name="action" value="Save" >{{ _('Save') }} </button>
 </form>