Merge pull request #302 from SpiderOak/management_console_3.3.2-beta.10

Management console 3.3.2 beta.10

django/apps/blue_management/blue_mgnt/management/commands/backupstatus.py

@@ -1,6 +1,7 @@
 import csv
 import time
 import os
+import datetime
 
 from django.core.management.base import BaseCommand
 from django.utils import timezone
@@ -57,6 +58,8 @@ def handle(self, *args, **options):
             for device in api.list_devices(user['email']):
                 last_backup_complete = device['last_backup_complete']
                 if (
+                    last_backup_complete
+                    and
                     self._backed_up_within(last_backup_complete, backed_up_within_seconds)
                     and not
                     self._backed_up_within(last_backup_complete, not_backed_up_within_seconds)
@@ -65,8 +68,12 @@ def handle(self, *args, **options):
                         user['name'],
                         device['name'],
                         user['bytes_stored'],
-                        user['last_login'],
-                        device['last_backup_complete'],
+                        datetime.datetime.fromtimestamp(
+                            device['last_login'],
+                        ).strftime('%Y-%m-%d_%H:%M:%S'),
+                        datetime.datetime.fromtimestamp(
+                            device['last_backup_complete'],
+                        ).strftime('%Y-%m-%d_%H:%M:%S'),
                     ])
 
         rows = sorted(

django/apps/blue_management/blue_mgnt/views/settings.py

@@ -69,9 +69,7 @@ def save_settings(request, api, options):
     config_mgr_.apply_config()
 
     if 'timezone' in cleaned_data:
-        with open('/etc/timezone', 'w') as f:
-            f.write(cleaned_data['timezone'])
-        subprocess.call(['dpkg-reconfigure', '-f', 'noninteractive', 'tzdata'])
+        subprocess.call(['timedatectl', 'set-timezone', cleaned_data['timezone']])
 
 
 class IPBlockForm(forms.Form):

django/apps/blue_management/blue_mgnt/views/views.py

@@ -748,7 +748,7 @@ def __init__(self, url, count, page=1, per_page=25):
         # populate self.page_range with list holding the page numbers to render in nav.
         # self.page_range is (currently) hard-coded to always contain 10 items
         # None values represent need to present '...' for skipped page ranges
-        self.page_range = self.paginator.page_range
+        self.page_range = list(self.paginator.page_range)
         if last_page <= 10:
             pass
         else:
@@ -760,7 +760,7 @@ def __init__(self, url, count, page=1, per_page=25):
                                        self.page_range[self.page-3:self.page+3] +
                                        [None, last_page])
             else:
-                self.page_range = self.paginator.page_range[:8] + [None, last_page]
+                self.page_range = list(self.paginator.page_range)[:8] + [None, last_page]
 
     @property
     def query_offset(self):

upgrade/scripts/2013-11-13_permissions.sh

@@ -3,5 +3,3 @@
 . /etc/default/openmanage
 PYTHONPATH=/opt/openmanage/django:$PYTHONPATH 
 python /opt/openmanage/upgrade/scripts/permissions.py
-
-python /opt/openmanage/django/omva/manage.py syncdb --noinput

upgrade/scripts/permissions.py

@@ -5,10 +5,11 @@
 os.environ['DJANGO_SETTINGS_MODULE'] = 'omva.settings'
 
 import django
+django.setup()
+
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 
-django.setup()
 
 print "adding permissions"
 

upgrade/upgrade.sh

@@ -68,7 +68,7 @@ else
     echo "agent_config.json hasn't changed"
 fi
 
-\cp -rf /opt/openmanage.$CURRENT_DATE/etc/keys/* /opt/openmanage/etc/keys
+rsync /opt/openmanage.$CURRENT_DATE/etc/keys/* /opt/openmanage/etc/keys
 
 echo "Setting django secret key"
 random_string="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c 64;echo;)"