Adding general post edit

Zambom
1 parent 5f472d6b
Showing 7 changed files with 128 additions and 12 deletions Show diff stats
mural/migrations/0005_mural_edited.py
mural/models.py
mural/templates/mural/_view.html
mural/templates/mural/list.html
mural/templatetags/mural_filters.py
mural/urls.py
mural/views.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-02-06 21:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mural', '0004_auto_20170206_1348'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mural',
+            name='edited',
+            field=models.BooleanField(default=False, verbose_name='Edited'),
+        ),
+    ]
@@ -3,6 +3,8 @@ from django.core import validators
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from topics.decorators import always_as_child
+
 from categories.models import Category
 from subjects.models import Subject
 from topics.models import KnowsChild, Resource
@@ -22,17 +24,31 @@ class Mural(KnowsChild):
 	user = models.ForeignKey(User, verbose_name = _('User'), related_name = "post_user", null = True)
 	create_date = models.DateTimeField(_('Create Date'), auto_now_add = True)
 	last_update = models.DateTimeField(_('Last Update'), auto_now = True)
+	edited = models.BooleanField(_('Edited'), default = False)
+
+	@always_as_child
+	def update_link(self):
+		pass
 class GeneralPost(Mural):
 	space = models.IntegerField(_('Space'), default = 0, blank = True)
+	def update_link(self):
+		return "mural:update_general"
+
 class CategoryPost(Mural):
 	space = models.ForeignKey(Category, verbose_name = ('Category'), related_name = 'post_category')
+	def update_link(self):
+		return ""
+
 class SubjectPost(Mural):
 	space = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name = 'post_subject')
 	resource = models.ForeignKey(Resource, verbose_name = _('Resource'), related_name = 'post_resource', null = True)
+	def update_link(self):
+		return ""
+
 class Comment(models.Model):
 	comment = models.TextField(_('Comment'), blank = True)
 	image = models.ImageField(verbose_name = _('Image'), null=True, blank = True, upload_to = 'posts/comments/', validators = [validate_img_extension])
@@ -41,12 +57,18 @@ class Comment(models.Model):
 	create_date = models.DateTimeField(_('Create Date'), auto_now_add = True)
 	last_update = models.DateTimeField(_('Last Update'), auto_now = True)
+"""
+	Model to handle posts visualizations
+"""
 class MuralVisualizations(models.Model):
 	viewed = models.BooleanField(_('Viewed'), default = False)
 	post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'visualization_post', null = True)
 	comment = models.ForeignKey(Comment, verbose_name = _('Comment'), related_name = 'visualization_comment', null = True)
 	user = models.ForeignKey(User, verbose_name = _('User'), related_name = "visualization_user", null = True)
+"""
+	Model to handle users favorite posts
+"""
 class MuralFavorites(models.Model):
 	post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'favorites_post', null = True)
 	user = models.ForeignKey(User, verbose_name = _('User'), related_name = "favorites_user", null = True)
 \ No newline at end of file
 {% load i18n mural_filters %}
-<div class="row panel panel-default">
+<div id="post-{{ post.id }}" class="row panel panel-default">
 	<div class="panel-body post">
 		<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 post-img">
 			<img src="{{ post.user.image_url }}" class="img-responsive" />
@@ -18,7 +18,7 @@
 		                	<i class="fa fa-ellipsis-v" aria-hidden="true"></i>
 		                </button>
 						<ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-		                    <li><a href=""><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li>
+		                    <li><a onclick="editPost($(this));" data-url="{% url post.update_link post.id %}" data-post="{{ post.id }}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li>
 		                    <li>
 		                    <a href="" aria-hidden="true"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
 		                </ul>
@@ -32,7 +32,7 @@
 			</h4>
 			<p class="time">
 				<i class="fa fa-clock-o"></i>
-				{% trans 'In' %} {{ post.last_update }}
+				{% trans 'In' %} {{ post.last_update }} {{ post|is_edited }}
 			</p>
 			{% autoescape off %}
@@ -65,11 +65,11 @@
                         $('#post-modal-form').modal('show');
                     }
-                })
+                });
             });
         });
-        function setPostFormSubmit() {
+        function setPostFormSubmit(post = "") {
             var frm = $('#post-form');
             frm.submit(function () {
@@ -82,9 +82,17 @@
                     dataType: "json",
                     async: false,
                     success: function (data) {
-                        $('.posts').prepend(data.view);
+                        if (post != "") {
+                            var old = $("#post-" + post);
+                            
+                            old.before(data.view);
+
+                            old.remove();
+                        } else {
+                            $('.posts').prepend(data.view);
-                        $('.no-subjects').attr('style', 'display:none');
+                            $('.no-subjects').attr('style', 'display:none');
+                        }
                         $('#post-modal-form').modal('hide');
@@ -92,7 +100,7 @@
                     },
                     error: function(data) {
                         $("#post-modal-form").html(data.responseText);
-                        setPostFormSubmit();
+                        setPostFormSubmit(post);
                     },
                     cache: false,
                     contentType: false,
@@ -123,7 +131,25 @@
                     btn.attr('data-original-title', response.label);
                 }
             });
+        }
+
+        function editPost(btn) {
+            var url = btn.data('url');
+            var post = btn.data('post');
+
+            console.log(url);
+            console.log(post);
+            $.ajax({
+                url: url,
+                success: function (data) {
+                    $('#post-modal-form').html(data);
+
+                    setPostFormSubmit(post);
+
+                    $('#post-modal-form').modal('show');
+                }
+            });
         }
     </script>
 {% endblock %}
 \ No newline at end of file
@@ -5,6 +5,13 @@ from mural.models import MuralFavorites
 register = template.Library()
+@register.filter(name = 'is_edited')
+def is_edited(post):
+	if post.edited:
+		return _("(Edited)")
+
+	return ""
+
 @register.filter(name = 'action_icon')
 def action_icon(action):
 	if action == "comment":
@@ -4,6 +4,7 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.GeneralIndex.as_view(), name='manage_general'),
 	url(r'^create_gen/$', views.GeneralCreate.as_view(), name='create_general'),
-	url(r'^render_post/([\w_-]+)/$', views.render_gen_post, name='render_post_general'),
+	url(r'^update_gen/(?P<pk>[\w_-]+)/$', views.GeneralUpdate.as_view(), name='update_general'),
+	url(r'^render_post/([\w_-]+)/([\w_-]+)/$', views.render_gen_post, name='render_post_general'),
 	url(r'^favorite/([\w_-]+)/$', views.favorite, name='favorite'),
 ]
 \ No newline at end of file
@@ -97,17 +97,57 @@ class GeneralCreate(LoginRequiredMixin, generic.edit.CreateView):
 		return context
 	def get_success_url(self):
-		return reverse_lazy('mural:render_post_general', args = (self.object.id, ))
+		return reverse_lazy('mural:render_post_general', args = (self.object.id, 'create', ))
-def render_gen_post(request, post):
+class GeneralUpdate(LoginRequiredMixin, generic.UpdateView):
+	login_url = reverse_lazy("users:login")
+	redirect_field_name = 'next'
+
+	template_name = 'mural/_form.html'
+	model = GeneralPost
+	form_class = GeneralPostForm
+
+	def form_invalid(self, form):
+		context = super(GeneralUpdate, self).form_invalid(form)
+		context.status_code = 400
+
+		return context
+
+	def form_valid(self, form):
+		self.object = form.save(commit = False)
+
+		self.object.edited = True
+
+		self.object.save()
+		
+		return super(GeneralUpdate, self).form_valid(form)
+
+	def get_context_data(self, *args, **kwargs):
+		context = super(GeneralUpdate, self).get_context_data(*args, **kwargs)
+
+		context['form_url'] = reverse_lazy("mural:update_general", args = (), kwargs = {'pk': self.object.id})
+
+		return context
+
+	def get_success_url(self):
+		return reverse_lazy('mural:render_post_general', args = (self.object.id, 'update', ))
+
+def render_gen_post(request, post, msg):
 	post = get_object_or_404(GeneralPost, id = post)
 	context = {}
 	context['post'] = post
+	msg = ""
+
+	if msg == 'create':
+		msg = _('Your post was published successfully!')
+	else:
+		msg = _('Your post was edited successfully!')
+
 	html = render_to_string("mural/_view.html", context, request)
-	return JsonResponse({'message': _('Your post was published successfully!'), 'view': html})
+	return JsonResponse({'message': msg, 'view': html})
 @login_required
 def favorite(request, post):
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-02-06 21:12
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('mural', '0004_auto_20170206_1348'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AddField(
	16	+ model_name='mural',
	17	+ name='edited',
	18	+ field=models.BooleanField(default=False, verbose_name='Edited'),
	19	+ ),
	20	+ ]
1	{% load i18n mural_filters %}	1	{% load i18n mural_filters %}
2		2
3	-<div class="row panel panel-default">	3	+<div id="post-{{ post.id }}" class="row panel panel-default">
4	<div class="panel-body post">	4	<div class="panel-body post">
5	<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 post-img">	5	<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 post-img">
6	<img src="{{ post.user.image_url }}" class="img-responsive" />	6	<img src="{{ post.user.image_url }}" class="img-responsive" />
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	<i class="fa fa-ellipsis-v" aria-hidden="true"></i>	18	<i class="fa fa-ellipsis-v" aria-hidden="true"></i>
19	</button>	19	</button>
20	<ul class="dropdown-menu pull-right" aria-labelledby="moreActions">	20	<ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
21	- <li><a href=""><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li>	21	+ <li><a onclick="editPost($(this));" data-url="{% url post.update_link post.id %}" data-post="{{ post.id }}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li>
22	<li>	22	<li>
23	<a href="" aria-hidden="true"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>	23	<a href="" aria-hidden="true"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
24	</ul>	24	</ul>
	@@ -32,7 +32,7 @@		@@ -32,7 +32,7 @@
32	</h4>	32	</h4>
33	<p class="time">	33	<p class="time">
34	<i class="fa fa-clock-o"></i>	34	<i class="fa fa-clock-o"></i>
35	- {% trans 'In' %} {{ post.last_update }}	35	+ {% trans 'In' %} {{ post.last_update }} {{ post\|is_edited }}
36	</p>	36	</p>
37		37
38	{% autoescape off %}	38	{% autoescape off %}
	@@ -5,6 +5,13 @@ from mural.models import MuralFavorites		@@ -5,6 +5,13 @@ from mural.models import MuralFavorites
5		5
6	register = template.Library()	6	register = template.Library()
7		7
		8	+@register.filter(name = 'is_edited')
		9	+def is_edited(post):
		10	+ if post.edited:
		11	+ return _("(Edited)")
		12	+
		13	+ return ""
		14	+
8	@register.filter(name = 'action_icon')	15	@register.filter(name = 'action_icon')
9	def action_icon(action):	16	def action_icon(action):
10	if action == "comment":	17	if action == "comment":
	@@ -97,17 +97,57 @@ class GeneralCreate(LoginRequiredMixin, generic.edit.CreateView):		@@ -97,17 +97,57 @@ class GeneralCreate(LoginRequiredMixin, generic.edit.CreateView):
97	return context	97	return context
98		98
99	def get_success_url(self):	99	def get_success_url(self):
100	- return reverse_lazy('mural:render_post_general', args = (self.object.id, ))	100	+ return reverse_lazy('mural:render_post_general', args = (self.object.id, 'create', ))
101		101
102	-def render_gen_post(request, post):	102	+class GeneralUpdate(LoginRequiredMixin, generic.UpdateView):
		103	+ login_url = reverse_lazy("users:login")
		104	+ redirect_field_name = 'next'
		105	+
		106	+ template_name = 'mural/_form.html'
		107	+ model = GeneralPost
		108	+ form_class = GeneralPostForm
		109	+
		110	+ def form_invalid(self, form):
		111	+ context = super(GeneralUpdate, self).form_invalid(form)
		112	+ context.status_code = 400
		113	+
		114	+ return context
		115	+
		116	+ def form_valid(self, form):
		117	+ self.object = form.save(commit = False)
		118	+
		119	+ self.object.edited = True
		120	+
		121	+ self.object.save()
		122	+
		123	+ return super(GeneralUpdate, self).form_valid(form)
		124	+
		125	+ def get_context_data(self, args, *kwargs):
		126	+ context = super(GeneralUpdate, self).get_context_data(args, *kwargs)
		127	+
		128	+ context['form_url'] = reverse_lazy("mural:update_general", args = (), kwargs = {'pk': self.object.id})
		129	+
		130	+ return context
		131	+
		132	+ def get_success_url(self):
		133	+ return reverse_lazy('mural:render_post_general', args = (self.object.id, 'update', ))
		134	+
		135	+def render_gen_post(request, post, msg):
103	post = get_object_or_404(GeneralPost, id = post)	136	post = get_object_or_404(GeneralPost, id = post)
104		137
105	context = {}	138	context = {}
106	context['post'] = post	139	context['post'] = post
107		140
		141	+ msg = ""
		142	+
		143	+ if msg == 'create':
		144	+ msg = _('Your post was published successfully!')
		145	+ else:
		146	+ msg = _('Your post was edited successfully!')
		147	+
108	html = render_to_string("mural/_view.html", context, request)	148	html = render_to_string("mural/_view.html", context, request)
109		149
110	- return JsonResponse({'message': _('Your post was published successfully!'), 'view': html})	150	+ return JsonResponse({'message': msg, 'view': html})
111		151
112	@login_required	152	@login_required
113	def favorite(request, post):	153	def favorite(request, post):