From 9bebc8b04e1a4351767ea6e14d7b33a5e8d0bc3c Mon Sep 17 00:00:00 2001
From: Antoine Nguyen
Date: Thu, 12 Apr 2018 17:26:10 +0200
Subject: [PATCH] Few fixes.
---
frontend/package.json | 1 +
frontend/src/App.vue | 8 +++++++-
frontend/src/main.js | 6 ++++++
modoboa/admin/settings.py | 2 +-
test_project/test_project/settings.py | 2 ++
5 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/frontend/package.json b/frontend/package.json
index d6470f118..a982d7397 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,6 +14,7 @@
},
"dependencies": {
"buefy": "^0.6.5",
+ "js-cookie": "^2.2.0",
"vue": "^2.5.2",
"vue-resource": "^1.5.0",
"vue-router": "^3.0.1"
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 77ab93e35..47e74acd3 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -9,11 +9,17 @@
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 01b0f4174..94611b76f 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -2,6 +2,8 @@ import Vue from 'vue'
import Buefy from 'buefy'
import 'buefy/lib/buefy.css'
+import Cookies from 'js-cookie'
+
import App from './App'
import router from './router'
@@ -9,6 +11,10 @@ Vue.use(Buefy)
Vue.config.productionTip = false
+/* Deal with django CSRF protection */
+let csrftoken = Cookies.get('csrftoken')
+Vue.http.headers.common['X-CSRFTOKEN'] = csrftoken
+
/* eslint-disable no-new */
new Vue({
el: '#app',
diff --git a/modoboa/admin/settings.py b/modoboa/admin/settings.py
index 4898b0ddf..e2f59b84d 100644
--- a/modoboa/admin/settings.py
+++ b/modoboa/admin/settings.py
@@ -18,7 +18,7 @@ def apply(settings):
if "webpack_loader" not in settings["INSTALLED_APPS"]:
settings["INSTALLED_APPS"] += ("webpack_loader", )
settings["WEBPACK_LOADER"] = {
- "CALENDAR": {
+ "ADMIN": {
"CACHE": not DEBUG,
"BUNDLE_DIR_NAME": "admin/",
"STATS_FILE": ADMIN_STATS_FILES.get("dev" if DEBUG else "prod"),
diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py
index c2a1635f4..0c5d9c54d 100644
--- a/test_project/test_project/settings.py
+++ b/test_project/test_project/settings.py
@@ -35,6 +35,8 @@ ALLOWED_HOSTS = [
"localhost",
]
+INTERNAL_IPS = ['127.0.0.1']
+
SITE_ID = 1
# Security settings