Merge branch 'DEV'

8 files changed, 33 insertions, 23 deletions

diff --git a/webapp/backup/backup.sh b/webapp/backup/backup.sh
index a8a1027..2052c54 100755
--- a/webapp/backup/backup.sh
+++ b/webapp/backup/backup.sh
@@ -2,10 +2,12 @@
 PROJECT_ROOT="/home/activitycentral/virtualenvs/polls/webapp"
 
 BACKUP_DIR="/home/activitycentral/backup_cold"
-MEDIA=$PROJECT_ROOT"/webapp/media"
+MEDIA=$PROJECT_ROOT/webapp/media
 
 DB_NAME="prod_polls"
-SQLITE_PATH=$PROJECT_ROOT"/db/database.db"
+SQLITE_PATH=$PROJECT_ROOT/db/database.db
+
+ERROR_LOG=$BACKUP_DIR/error.log
 
 function stop_apache {
 	echo "Stopping apache..."
@@ -14,17 +16,17 @@ function stop_apache {
 
 function dump_mongodb {
 	echo "Dumping mongodb..."
-	mongodump --out $BACKUP_DIR --db $DB_NAME
+	mongodump --out $BACKUP_DIR --db $DB_NAME 2>$ERROR_LOG
 }
 
 function dump_sqlite {
 	echo "Dumping sqlite..."
-	sqlite3 $SQLITE_PATH .dump > $BACKUP_DIR/sqlite_database.bak
+	sqlite3 $SQLITE_PATH .dump > $BACKUP_DIR/sqlite_database.bak 2>$ERROR_LOG
 }
 
 function copy_media {
 	echo "Copying media files..."
-	rsync -av --exclude="cache/" $MEDIA/* $BACKUP_DIR/media
+	rsync -av --exclude="cache/" $MEDIA/* $BACKUP_DIR/media 2>$ERROR_LOG
 }
 
 function start_apache {
@@ -32,6 +34,10 @@ function start_apache {
 	sudo service apache2 start
 }
 
+function heartbeat {
+	date > $BACKUP_DIR/last_backup_date
+}
+
 stop_apache
 
 dump_mongodb
@@ -41,3 +47,5 @@ dump_sqlite
 copy_media
 
 start_apache
+
+heartbeat
diff --git a/webapp/polls/models.py b/webapp/polls/models.py
index 9402c94..1117728 100644
--- a/webapp/polls/models.py
+++ b/webapp/polls/models.py
@@ -72,7 +72,8 @@ class Poll(Document, AbstracErrorObject):
     OPEN = "Abierta"
     CLOSED = "Cerrada"
 
-    def __init__(self, data={}, *args, **kwargs):
+    def __init__(self, data=None, *args, **kwargs):
+        data = {} if data is None else data
         super(Poll, self).__init__(data=data, *args, **kwargs)
         self.results_path = settings.RESULT_BCK_ROOT
         self.name = data.get('name', None)
@@ -498,9 +499,9 @@ class AbstractObject(AbstracErrorObject):
 
 class Option(AbstractObject, ComponentStructure):
 
-    def __init__(self, data={}, *args, **kwargs):
+    def __init__(self, data=None, *args, **kwargs):
         super(Option, self).__init__(*args, **kwargs)
-
+        data = {} if data is None else data
         self.type = data.get('type', None)
 
         self.id = data.get('id', None)
@@ -664,7 +665,8 @@ class Dependence(AbstracErrorObject):
             'values': self.values
         }
 
-    def validate(self, options=[]):
+    def validate(self, options=None):
+        options = [] if options is None else options
         self.errors = []
 
         if not any(self.values):
@@ -733,7 +735,7 @@ class Field(AbstractObject, ComponentStructure):
         'TextInput': (lambda f: True, ""),
     }
 
-    def __init__(self, data={}, *args, **kwargs):
+    def __init__(self, data, *args, **kwargs):
         super(Field, self).__init__(*args, **kwargs)
 
         self.poll_id = None
@@ -816,7 +818,8 @@ class Field(AbstractObject, ComponentStructure):
             self.img = None
             raise Field.ValidationError(e.messages[0])
 
-    def validate(self, options=[], new_data=None):
+    def validate(self, options=None, new_data=None):
+        options = [] if options is None else options
         self.errors = []
         rule, msg = Field.VALIDATION_RULES.get(self.widget_type)
         if not rule(self):
@@ -949,7 +952,7 @@ class Field(AbstractObject, ComponentStructure):
 
 class Group(AbstractObject, ComponentStructure):
 
-    def __init__(self, data={}, *args, **kwargs):
+    def __init__(self, data, *args, **kwargs):
         super(Group, self).__init__(*args, **kwargs)
 
         order = data.get('order', None)
@@ -1023,7 +1026,7 @@ class Structure(AbstractObject, ComponentStructure):
     READ_ONLY_MSG = ('No puede modificar la estructura'
                      ' de una encuesta con resultados.')
 
-    def __init__(self, data={}, poll=None, *args, **kwargs):
+    def __init__(self, data, poll=None, *args, **kwargs):
         super(Structure, self).__init__(poll, *args, **kwargs)
         self.data = data
         self.groups = []
diff --git a/webapp/polls/tests/poll_result_file_tests.py b/webapp/polls/tests/poll_result_file_tests.py
index 4c3ee26..996a8b9 100644
--- a/webapp/polls/tests/poll_result_file_tests.py
+++ b/webapp/polls/tests/poll_result_file_tests.py
@@ -1,3 +1,4 @@
+# pylint: disable=C0111,C0103
 import json
 import tempfile
 import os
diff --git a/webapp/polls/tests/poll_tests.py b/webapp/polls/tests/poll_tests.py
index 0b3a168..84a0fe0 100644
--- a/webapp/polls/tests/poll_tests.py
+++ b/webapp/polls/tests/poll_tests.py
@@ -1,3 +1,4 @@
+# pylint: disable=C0111
 # -*- encoding: utf-8 -*-
 import json
 import warnings
diff --git a/webapp/polls/tests/structure_tests.py b/webapp/polls/tests/structure_tests.py
index c9fe0d9..a9f90a4 100644
--- a/webapp/polls/tests/structure_tests.py
+++ b/webapp/polls/tests/structure_tests.py
@@ -208,7 +208,7 @@ class StructureTests(MongoTestCase):
             }
         }
 
-        structure = Structure(poll=self.poll)
+        structure = Structure(data={}, poll=self.poll)
 
         field = Field({
             'name': "field_0_0",
diff --git a/webapp/pollster/models.py b/webapp/pollster/models.py
index 606e88b..46264bf 100644
--- a/webapp/pollster/models.py
+++ b/webapp/pollster/models.py
@@ -11,7 +11,7 @@ class Pollster(Document):
     group_name = "pollster"
     collection_name = 'pollsters'
 
-    def __init__(self, data={}, *args, **kwargs):
+    def __init__(self, data, *args, **kwargs):
         super(Pollster, self).__init__(data=data, *args, **kwargs)
 
         self.user_id = data.get('user_id', None)
diff --git a/webapp/pollster/templates/pollster-assigned-polls.html b/webapp/pollster/templates/pollster-assigned-polls.html
index e201dd7..8a37d50 100644
--- a/webapp/pollster/templates/pollster-assigned-polls.html
+++ b/webapp/pollster/templates/pollster-assigned-polls.html
@@ -31,6 +31,4 @@
             </div>
         {% endif %}
     </div>
-    <script src="{{ STATIC_URL }}js/ui-bootstrap-0.2.0.min.js"></script>
-    <script src="{{ STATIC_URL }}js/ui-bootstrap-tpls-0.2.0.min.js"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/webapp/webapp/settings.py b/webapp/webapp/settings.py
index b3e5671..b403686 100644
--- a/webapp/webapp/settings.py
+++ b/webapp/webapp/settings.py
@@ -194,15 +194,14 @@ LOGGING = {
         }
     },
     'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler'
         }
     },
     'loggers': {
         'django.request': {
-            'handlers': ['mail_admins'],
+            'handlers': ['console'],
             'level': 'ERROR',
             'propagate': True,
         },