Merge remote-tracking branch 'assist/unstable' into unstable

core/settings.py

@@ -53,8 +53,9 @@ INSTALLED_APPS = [
     'django_spaghetti',
     'debug_toolbar',
     'ckeditor',
-    'landing.apps.LandingConfig',
     'fontawesomefree',
+    'landing',
+    'captcha',
 ]
 
 MIDDLEWARE = [

core/urls.py

@@ -6,15 +6,15 @@ from django.conf.urls.i18n import i18n_patterns
 
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+    path('testwords/admin/', admin.site.urls),
 ] + i18n_patterns(
         path('i18n/', include('django.conf.urls.i18n')),
-        path('', include('sharix_admin.urls')),
+        path('', include("landing.urls")),
         path('tickets/', include('tickets.urls', namespace='tickets'), name='tickets'),
         path('design/', include("design_template.urls"), name='design'),
         path('dbsynce/', include("dbsynce.urls"), name="dbsynce"),
         path('webservice/', include("webservice_running.urls"), name='webservice_running'),
-        path('landing/', include("landing.urls"), name="landing"),
+        path('my/', include('sharix_admin.urls'), name="Admin"), # FIXME: Check where using Admin name and replace this to admin (name="Admin" -> name="admin")
         prefix_default_language=False,
     )
     

requirements.txt

@@ -57,3 +57,4 @@ xmpppy==0.7.1
 django-ckeditor
 pillow
 fontawesomefree
+django-simple-captcha

sharix_admin/forms/document.py

@@ -17,7 +17,7 @@ class DocumentUploadForm(forms.Form):
     )
     doc_file = forms.FileField(
         widget=forms.ClearableFileInput(attrs={
-            'multiple': True,
+            'allow_multiple_selected': True,
             'id': 'doc-file-input'
         }),
         required=True,