Unitarias

djgentelella/blog/blog.py

@@ -8,7 +8,7 @@
 
 from djgentelella.permission_management import AllPermissionByAction, \
     AnyPermissionByAction
-from objectmanagement import AuthAllPermBaseObjectManagement
+from djgentelella.objectmanagement import AuthAllPermBaseObjectManagement
 
 
 class BaseObjectBlog(AuthAllPermBaseObjectManagement):
@@ -18,9 +18,9 @@ class BaseObjectBlog(AuthAllPermBaseObjectManagement):
         'update': None,
         'retrieve': None,
         'get_values_for_update': None,
+        'destroy': None
 
     }
-
     # authentication_classes = (TokenAuthentication, SessionAuthentication)
     # queryset =
     pagination_class = LimitOffsetPagination

djgentelella/blog/fields.py

@@ -0,0 +1,41 @@
+import base64
+from django.core.files.base import ContentFile
+from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
+
+class GTBase64FileField(serializers.Field):
+    def to_internal_value(self, data):
+
+        if not isinstance(data, list):
+            raise serializers.ValidationError(_("List was expected"))
+
+
+        if len(data) < 1:
+            raise serializers.ValidationError(
+                _("List must contain at least one element"))
+
+
+        file_info = data[0]
+
+
+        if not isinstance(file_info, dict) or 'name' not in file_info or 'value' not in file_info:
+            raise serializers.ValidationError(
+                _("Invalid structure. You need to provide {name: 'name of file', value: 'base64 string representation'}"))
+
+
+        file_name = file_info['name']
+        file_value = file_info['value']
+
+        try:
+
+            decoded_value = base64.b64decode(file_value)
+        except base64.binascii.Error:
+            raise serializers.ValidationError(_(
+                "The 'value' is not a valid base64 string"))
+
+        file_content = ContentFile(decoded_value, name=file_name)
+
+        return file_content
+
+    def to_representation(self, value):
+        pass

djgentelella/blog/forms.py

@@ -14,16 +14,14 @@ class Meta:
         exclude = ('published_content', 'author')
         widgets = {
             'title': genwidgets.TextInput,
-            'content': TextareaWysiwyg,
-            'resume': TextareaWysiwyg,
+            'content': genwidgets.Textarea,
+            'resume': genwidgets.Textarea,
             'is_published': genwidgets.YesNoInput,
             'categories': genwidgets.SelectMultipleAdd(attrs={
                 'add_url': reverse_lazy('blog:category_add')
             }),
 
         }
-
-
 class CategoryForm(CustomForm, forms.ModelForm):
     class Meta:
         model = models.Category

djgentelella/blog/templates/gentelella/blog/entry_list.html

@@ -43,6 +43,46 @@ <h3 class="heading-1"><span>{% trans 'List of blogs' %}</span></h3>
 {{block.super}}
 <script>
 
+document.addEventListener("DOMContentLoaded", function () {
+    tinymce.init({
+        selector: 'textarea.wysiwyg',
+        plugins: 'wordcount',  // Habilita el complemento de contador de palabras
+        // Otras configuraciones generales de TinyMCE
+    });
+
+     tinymce.init({
+    selector: 'textarea#id_create-content',
+    plugins: 'wordcount',  // Configura los complementos que deseas habilitar
+    // Otras configuraciones de TinyMCE
+    setup: function (editor) {
+        editor.on('change', function () {
+            // Captura el contenido actual del editor
+            var content = editor.getContent();
+
+            // Actualiza el valor del campo de texto en el formulario
+            document.getElementById('id_create-content').value = content;
+        });
+    }
+});
+
+
+ tinymce.init({
+    selector: 'textarea#id_create-resume',
+    plugins: 'wordcount',  // Configura los complementos que deseas habilitar
+    setup: function (editor) {
+        editor.on('change', function () {
+            // Captura el contenido actual del editor
+            var content = editor.getContent();
+
+            // Actualiza el valor del campo de texto en el formulario
+            document.getElementById('id_create-resume').value = content;
+        });
+    }
+});
+
+});
+
+
 var object_urls ={
 	list_url: "{% url 'api-objectbLog-list' %}",
 	destroy_url: "{% url 'api-objectbLog-detail' 0 %}",
@@ -84,9 +124,6 @@ <h3 class="heading-1"><span>{% trans 'List of blogs' %}</span></h3>
 	create: "#create_obj_modal",
   {% endif %}
 
-	//update: "#update_obj_modal",
-
-
 	 {% if perms.blog.delete_entry %}
 	destroy: "#delete_obj_modal",
 	   {% endif %}
@@ -115,10 +152,8 @@ <h3 class="heading-1"><span>{% trans 'List of blogs' %}</span></h3>
      'url': null,
      'i_class': 'fa fa-edit',
  })
-
  {% endif %}
 
-
 let objconfig={
 	urls: object_urls,
 	datatable_element:  "#blog_table",
@@ -133,7 +168,6 @@ <h3 class="heading-1"><span>{% trans 'List of blogs' %}</span></h3>
 
 let ocrud=ObjectCRUD("setmeunique", objconfig)/// setmeunique DISTINTO
 
-
 ocrud.detailblog = function(row) {
     console.log("El row es:", row);
     var slug = row.slug;
@@ -150,11 +184,6 @@ <h3 class="heading-1"><span>{% trans 'List of blogs' %}</span></h3>
 
 ocrud.init();
 
-
-
-
-
-
 </script>
 
 

djgentelella/blog/tests/test_API_blog.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 from djgentelella.blog.forms import EntryForm, CategoryForm
-from djgentelella.blog.models import Entry, Category
+from djgentelella.blog.models import Category
 
 class EntryFormTest(TestCase):
 

djgentelella/blog/tests/test_entry_detail.py

@@ -9,7 +9,12 @@
 class TestEntryDetail(TestCase):
 
     def setUp(self):
-        self.entry_1 = models.Entry.objects.create(title=u'Welcome!', is_published=True)
+        self.entry_1 = models.Entry.objects.create(
+            title=u'Welcome!',
+            is_published=True,
+            content='### Some Content',
+            resume='This is a resume',
+        )
 
         self.url = self.entry_1.get_absolute_url()
 

djgentelella/blog/tests/test_entry_forms.py

@@ -1,20 +1,23 @@
 from django.forms import ModelForm
 from django.test import TestCase
+from django.utils.html import strip_tags  # Agrega esta importación
 
 from djgentelella.blog import models
 
-
 class TestEntryEditing(TestCase):
 
     def setUp(self):
-        self.entry = models.Entry.objects.create(title=u'Welcome!',
-                                                 content='### Some Content',
-                                                 is_published=False)
+        self.entry = models.Entry.objects.create(
+            title=u'Welcome!',
+            content='### Some Content',
+            is_published=False,
+            resume='This is a resume',
+        )
 
         class EntryForm(ModelForm):
             class Meta:
                 model = models.Entry
-                fields = ['title', 'content', 'is_published']
+                fields = ['title', 'content', 'is_published', 'resume']
 
         self.form_cls = EntryForm
 
@@ -24,25 +27,25 @@ def test_form_editing(self):
             'title': 'Last Post (Final)',
             'content': '### Goodbye!',
             'is_published': True,
+            'resume': 'Last resume',
         }
 
         form = self.form_cls(update, instance=self.entry)
-
         form.save()
 
         actual = models.Entry.objects.get(pk=self.entry.pk)
-        self.assertEquals(actual.title, update['title'])
-        self.assertEquals(actual.content.raw, update['content'])
+        self.assertEqual(actual.title, update['title'])
+        self.assertEqual(actual.content.raw, update['content'])
         self.assertIsNotNone(actual.published_timestamp)
-
+        self.assertEqual(strip_tags(actual.resume.rendered), update['resume'])  # Comparar con rendered sin etiquetas HTML
 
 class TestEntryCreation(TestCase):
 
     def setUp(self):
         class EntryForm(ModelForm):
             class Meta:
                 model = models.Entry
-                fields = ['title', 'content', 'is_published']
+                fields = ['title', 'content', 'is_published', 'resume']
 
         self.form_cls = EntryForm
 
@@ -52,14 +55,14 @@ def test_form_create(self):
             'title': 'Last Post (Final)',
             'content': '### Goodbye!',
             'is_published': False,
+            'resume': 'Last resume',
         }
 
         form = self.form_cls(create)
-        print(form.errors)
-
         form.save()
 
         actual = models.Entry.objects.get(slug='last-post-final')
-        self.assertEquals(actual.title, create['title'])
-        self.assertEquals(actual.content.raw, create['content'])
+        self.assertEqual(actual.title, create['title'])
+        self.assertEqual(actual.content.raw, create['content'])
         self.assertIsNone(actual.published_timestamp)
+        self.assertEqual(strip_tags(actual.resume.rendered), create['resume'])  # Comparar con rendered sin etiquetas HTML

djgentelella/blog/urls.py

@@ -3,10 +3,8 @@
 from . import views
 
 from djgentelella.datatables.api import BlogViewSet
-
 from djgentelella.blog.views import object_blog
 from djgentelella.blog.viewset import ObjectBLog
-
 from demoapp.cruds import Personclass
 
 

djgentelella/blog/views.py

@@ -8,12 +8,9 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView, DetailView, CreateView, UpdateView, \
     DeleteView
-
 from . import models
 from .forms import EntryForm, CategoryForm
 from .models import Category
-
-
 from djgentelella.blog.forms import EntryForm
 from django.urls import reverse
 
@@ -38,10 +35,10 @@ def get_context_data(self, **kwargs):
         context['q'] = self.request.GET.get('q', '')
         context['entry'] = models.Entry.objects.first()
         context['create_form'] = EntryForm(prefix='create')
-
         return context
 
 
+
 class EntryDetail(DetailView):
     model = models.Entry
     template_name = 'gentelella/blog/entry_detail.html'
@@ -60,21 +57,21 @@ def get_context_data(self, **kwargs):
         return context
 
 
-
-
 class EntryCreate(PermissionRequiredMixin, CreateView):
     permission_required = 'blog.add_entry'
     model = models.Entry
     template_name = 'gentelella/blog/entry_form.html'
     success_url = reverse_lazy('blog:entrylist')
     form_class = EntryForm
 
-
     def form_valid(self, form):
         response = super().form_valid(form)
         publishbtn = self.request.POST.get('publishbtn', '') == 'publish'
         if publishbtn:
             self.object.is_published = True
+
+        self.object.content = form.cleaned_data['content']
+
         if self.object.is_published and publishbtn:
             self.object.published_content = self.object.content.rendered
         if self.object.author is None:

djgentelella/blog/viewset.py

@@ -14,17 +14,19 @@ class ObjectBLog(BaseObjectBlog):
         'create': serializer.BlogCreateSerializer,
         'update': serializer.BlogCreateSerializer,
         'retrieve': serializer.BlogUpdateSerializer,
-        'get_values_for_update': serializer.BlogUpdateSerializer
+        'get_values_for_update': serializer.BlogUpdateSerializer,
+        'destroy': serializer.BlogDestroySerializer
     }
+
     perms = {
-        'list': ['blog.view_entry'],
-        'create': ['blog.add_category', 'blog.add_entry', 'blog.add_entry_image'],
-        'update': ['blog.change_category', 'blog.change_entry', 'blog.change_entry_image'],
-        'retrieve': ['blog.view_entry', 'blog.view_category', 'blog.view_entry_image'],
-        'get_values_for_update': ['blog.view_entry'],
-        'destroy': ['blog.delete_entry_image', 'blog.delete_category', 'blog.delete_entry']
+        'list': ['blog.view_entry', 'blog.view_entry_image', 'blog.view_category'],
+        'create': ['blog.add_entry', 'blog.add_entry_image', 'blog.add_category'],
+        'update': ['blog.change_entry', 'blog.change_entry_image', 'blog.change_category'],
+        'retrieve': ['blog.view_entry', 'blog.view_entry_image', 'blog.view_category'],
+        'get_values_for_update': ['blog.view_entry', 'blog.view_entry_image', 'blog.view_category'],
+        'destroy': ['blog.delete_entry', 'blog.delete_entry_image', 'blog.delete_category']
     }
-    #Asigna el author al usuario actual
+
     def perform_create(self, serializer): # ESTO ASIGNA EL author
         serializer.save(author=self.request.user)
         self.operation_type = 'create'