From 418c257978d4c3909f66845f73daa2a38b89b0a6 Mon Sep 17 00:00:00 2001
From: Tom <tmslav@gmail.com>
Date: Fri, 20 May 2016 15:00:06 +0000
Subject: [PATCH] delete orders

---
 dynamicweb/settings/base.py | 38 +++++++++++++++----------------------
 hosting/views.py            |  4 ----
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index de339f86..d681e9c9 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -84,18 +84,18 @@ INSTALLED_APPS = (
     'djangocms_file',
     'djangocms_picture',
     'djangocms_video',
-    'djangocms_flash',
-    'djangocms_googlemap',
-    'djangocms_inherit',
-    'djangocms_link',
-    'djangocms_teaser',
+    # 'djangocms_flash',
+    # 'djangocms_googlemap',
+    # 'djangocms_inherit',
+    # 'djangocms_link',
+    # 'djangocms_teaser',
     'djangocms_page_meta',
     'djangocms_text_ckeditor',
     'djangocms_admin_style',
     'cmsplugin_filer_file',
     'cmsplugin_filer_folder',
     'cmsplugin_filer_link',
-     'cmsplugin_filer_teaser',
+    # 'cmsplugin_filer_teaser',
     'cmsplugin_filer_video',
     #
     # blog
@@ -103,10 +103,9 @@ INSTALLED_APPS = (
     'reversion',
     # ungleich
     'ungleich',
-#    'ungleich_page',
+    'ungleich_page',
     'hosting',
     'digitalglarus',
-
 )
 
 MIDDLEWARE_CLASSES = (
@@ -176,7 +175,7 @@ CMS_TEMPLATES = (
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'app_new',
+        'NAME': 'app',
     }
 }
 
@@ -280,12 +279,12 @@ CACHES = {
     }
 }
 
-#if LOGIN_URL is None:
-#    LOGIN_URL = APP_ROOT_ENDPOINT + 'login/'
-#if LOGOUT_URL is None:
-#    LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/'
-#if LOGIN_REDIRECT_URL is None:
-#    LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
+if LOGIN_URL is None:
+    LOGIN_URL = APP_ROOT_ENDPOINT + 'login/'
+if LOGOUT_URL is None:
+    LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/'
+if LOGIN_REDIRECT_URL is None:
+    LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
@@ -302,7 +301,7 @@ META_SITE_PROTOCOL = 'http'
 META_USE_SITES = True
 MIGRATION_MODULES = {
     'cms': 'cms.migrations',
-    #'filer': 'filer.migrations_django',
+    # 'filer': 'filer.migrations_django',
     # 'menus': 'menus.migrations_django',
     'djangocms_flash': 'djangocms_flash.migrations_django',
     'djangocms_googlemap': 'djangocms_googlemap.migrations_django',
@@ -337,7 +336,6 @@ STATICFILES_FINDERS = (
 THUMBNAIL_PROCESSORS = (
     'easy_thumbnails.processors.colorspace',
     'easy_thumbnails.processors.autocrop',
-    #'easy_thumbnails.processors.scale_and_crop',
     'filer.thumbnail_processors.scale_and_crop_with_subject_location',
     'easy_thumbnails.processors.filters',
 )
@@ -443,12 +441,6 @@ PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'},)}
 AUTH_USER_MODEL = 'membership.CustomUser'
 
 
-
-ALLOWED_HOSTS = [
-    "*"
-    ]
-
-
 # PAYMENT
 
 STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services"
diff --git a/hosting/views.py b/hosting/views.py
index b4441a54..fbeb36ea 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -244,10 +244,6 @@ class OrdersHostingDeleteView(LoginRequiredMixin,DeleteView):
     login_url=reverse_lazy('hosting:login')
     success_url = reverse_lazy('hosting:orders')
     model = HostingOrder
-    def get_queryset(self):
-        user = self.request.user
-        self.queryset = VirtualMachinePlan.objects.active(user)
-        return super(VirtualMachinesPlanListView, self).get_queryset()
 
 class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
     template_name = "hosting/virtual_machines.html"