Merge branch 'release/7.1.1'

CHANGES.rst

@@ -1,5 +1,13 @@
 CHANGES
 =======
+7.1.1
+~~~~~
+- Fixed bug in copy to all task where article revision wasn't being saved
+
+7.1.0
+~~~~~
+- Added prometheus metrics. Changes required to project see link 
+  https://github.com/korfuri/django-prometheus/blob/master/django_prometheus/db/common.py
 
 7.0.9
 ~~~~~~

VERSION

@@ -1 +1 @@
-7.0.9
+7.1.1

molo/core/cookiecutter/scaffold/{{cookiecutter.directory}}/test_settings.py

@@ -2,7 +2,7 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
+        'ENGINE': 'django_prometheus.db.backends.sqlite3',
         'NAME': '{{cookiecutter.app_name}}_test.db',
     }
 }

molo/core/cookiecutter/scaffold/{{cookiecutter.directory}}/{{cookiecutter.app_name}}/settings/base.py

@@ -54,6 +54,7 @@
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django_extensions',
+    'django_prometheus',
 
     'taggit',
     'modelcluster',
@@ -95,6 +96,7 @@
 DEFAULT_SITE_PORT = 8000
 
 MIDDLEWARE_CLASSES = [
+    'django_prometheus.middleware.PrometheusBeforeMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'molo.core.middleware.ForceDefaultLanguageMiddleware',
@@ -112,6 +114,7 @@
 
     'molo.core.middleware.MoloGoogleAnalyticsMiddleware',
     'molo.core.middleware.MultiSiteRedirectToHomepage',
+    'django_prometheus.middleware.PrometheusAfterMiddleware',
 ]
 
 AUTHENTICATION_BACKENDS = [
@@ -176,8 +179,14 @@
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
 # SQLite (simplest install)
-DATABASES = {'default': dj_database_url.config(
-    default='sqlite:///%s' % (join(PROJECT_ROOT, 'db.sqlite3'),))}
+DATABASES = {
+    'default': dj_database_url.config(
+        default='sqlite:///%s' % (join(PROJECT_ROOT, 'db.sqlite3')),
+        engine='django_prometheus.db.backends.sqlite3')
+ }
+
+DATABASES['default']['TEST'] = {}
+DATABASES['default']['TEST']['NAME'] = join(PROJECT_ROOT, 'db.sqlite3')
 
 # PostgreSQL (Recommended, but requires the psycopg2 library and Postgresql
 #             development headers)

molo/core/tasks.py

@@ -306,12 +306,15 @@ def copy_to_all_task(page_id, user_id, site_pk):
                 )
                 copy_translation_pages(page, new_page)
                 create_new_article_relations(page, new_page)
-                if page.status_string == 'scheduled' and \
-                        new_page.status_string == 'draft' and \
-                        new_page.go_live_at is not None:
-                    new_page.save_revision().publish()
-                elif new_page.status_string == 'draft':
-                    new_page.save_revision()
+                revision = new_page.save_revision()
+                # If the original page is scheduled
+                if not page.live and not page.expired and \
+                        page.approved_schedule:
+                    # If the new page is in draft
+                    if not new_page.live and not new_page.expired and \
+                            not new_page.approved_schedule:
+                        if new_page.go_live_at is not None:
+                            revision.publish()
             else:
                 errors.append(str(
                     page.title + ' already exists in ' + main.title))

molo/core/urls.py

@@ -83,4 +83,5 @@
     url(
         r'^(\d+)/copy_to_all/$',
         views.copy_to_all, name='copy-to-all'),
+    url('', include('django_prometheus.urls')),
 ]

setup.py

@@ -46,6 +46,7 @@ def read(*parts):
     'django-storages==1.6.3',
     'Unidecode==0.04.16',
     'django-treebeard==4.2.0',
+    'django-prometheus',
 ]
 
 # we need to only install typing for python2