diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 6d58fc3..2445a91 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-j4jd&+4j^t_=@zr(#q@n!8e*58vkql6&_6w-t14ju8pw%ei%^s # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -cfg_dev_mode = False +cfg_dev_mode = True ALLOWED_HOSTS = ["rh.ambulance-clerc.ch"] if cfg_dev_mode: @@ -48,7 +48,9 @@ INSTALLED_APPS = [ 'custom_admin.apps.CustomAdminConfig', 'rangefilter', 'django.contrib.admin', - + 'carnet_rouge.apps.CarnetRougeConfig', + #'nextcloud.apps.NextcloudConfig', + 'tinymce', ] @@ -290,3 +292,10 @@ JAZZMIN_SETTINGS = { # Add a language dropdown into the admin "language_chooser": False, } + + +if cfg_dev_mode: + NEXTCLOUD_HOST = "cloud.ambulance-clerc.ch" +else: + NEXTCLOUD_HOST = "cloud.ambulance-clerc.ch" +NEXTCLOUD_USER_DEFAULT_PASSWORD = "Mc144*1870" diff --git a/Reskreen/urls.py b/Reskreen/urls.py index a15a9b5..9f6bbf5 100644 --- a/Reskreen/urls.py +++ b/Reskreen/urls.py @@ -23,4 +23,5 @@ urlpatterns = [ path('vehicules/', include('vehicles.urls')), path('caldav/', include('mycaldav.urls')), #path('collabs_hour/', include('collabs.urls')), + path('tinymce/', include('tinymce.urls')), ] diff --git a/carnet_rouge/models.py b/carnet_rouge/models.py index 535df14..b0204b3 100644 --- a/carnet_rouge/models.py +++ b/carnet_rouge/models.py @@ -3,6 +3,7 @@ from django.db import models from django.conf import settings from django.contrib.auth.models import Group from django.utils import timezone +from tinymce.models import HTMLField from django.dispatch import receiver from django.db.models.signals import pre_save @@ -28,7 +29,7 @@ class cr_Message(models.Model): sReadedUsers = models.TextField("Liste des utilisateurs ayant lu", blank=True) DestGroup = models.ForeignKey(Group, on_delete=models.DO_NOTHING) sTitle = models.CharField("Titre", max_length=120) - sText = models.TextField("Corps de texte") + sText = HTMLField("Corps de texte") dtValidityFrom = models.DateField("Validité depuis",default=timezone.now) dtValidityTo = models.DateField("Validité jusqu'à", blank=True, null=True) bEnabled = models.BooleanField("Actif", default=True) diff --git a/requirements.txt b/requirements.txt index 56ec5c4..1853556 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,3 +56,4 @@ x-wr-timezone==0.0.5 xhtml2pdf==0.2.7 zopfli==0.1.9 django-autologin +django-tinymce \ No newline at end of file