Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update

clientsideapp/views.py

@@ -29,7 +29,7 @@ def pays(request):
 def services(request):
     try:
         abon = request.user
-        all_tarifs = Tariff.objects.get_tariffs_by_group(abon.group.pk)
+        all_tarifs = Tariff.objects.get_tariffs_by_group(abon.group.pk).filter(is_admin=False)
         current_service = abon.active_tariff()
     except Abon.DoesNotExist:
         all_tarifs = None

devapp/models.py

@@ -109,7 +109,7 @@ class Device(models.Model):
             return
         #raise ProgrammingError('переделать это безобразие')
         # FIXME: переделать это безобразие
-        grp = self.user_group.id
+        grp = self.group.id
         code = ''
         if grp == 87:
             code = 'chk'

djing/settings.py

@@ -33,7 +33,7 @@ AUTHENTICATION_BACKENDS = (
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
+    #'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',

djing/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url, include
 from django.conf import settings
-from django.contrib import admin
+#from django.contrib import admin
 
 from .views import home
 
@@ -18,7 +18,7 @@ urlpatterns = [
     url(r'^msg/', include('msg_app.urls', namespace='msg_app')),
     url(r'^dialing/', include('dialing_app.urls', namespace='dialapp')),
     url(r'^groups/', include('group_app.urls', namespace='group_app')),
-    url(r'^admin/', admin.site.urls)
+    #url(r'^admin/', admin.site.urls)
 
 ]
 

photo_app/models.py

@@ -42,7 +42,7 @@ class Photo(models.Model):
             os.makedirs(path + '/min')
         im.save(fname)
         os.remove(self.image.path)
-        self.image = "%s.%s" % (hs, ext)
+        self.image = "media/%s.%s" % (hs, ext)
         super(Photo, self).save(*args, **kwargs)
 
         # class Meta:

static/clientside/custom.css

@@ -20,3 +20,7 @@ img.navbar-brand {
 .modal-header.success {background-color: #6ad245;}
 .modal-header.primary {background-color: #789cbb;}
 
+body{
+    padding: 88px 15px 0;
+}
+