Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

accounts/views.py

@@ -245,7 +245,7 @@ class BaseProfileView(ProfileInvalidView):
         profile = self.request.user.profile
         form = self.form_class(self.request.POST, instance=profile)
         form.save()
-        response = {'success': True}
+        response = {'success': True, 'rating': profile.user.rating}
         return HttpResponse(json.dumps(response), content_type='application/json')
 
 class WorkView(ProfileInvalidView):
@@ -261,7 +261,7 @@ class WorkView(ProfileInvalidView):
         #company = user.company
 
         #response = {'success': True, 'url':company.get_permanent_url()}
-        response = {'success': True}
+        response = {'success': True, 'rating': user.rating}
 
         return HttpResponse(json.dumps(response), content_type='application/json')
 
@@ -279,7 +279,7 @@ class AvatarView(BaseProfileView):
         form.save()
         if self.request.is_ajax():
             im = get_thumbnail(profile.avatar, '100x100', crop='center')
-            response = {'success': True, 'url': im.url}
+            response = {'success': True, 'url': im.url, 'rating': profile.user.rating}
             return HttpResponse(json.dumps(response), content_type='application/json')
         else:
             return HttpResponseRedirect('/profile/')
@@ -336,7 +336,7 @@ class NameView(ProfileInvalidView):
         user = self.request.user
         form = self.form_class(self.request.POST, instance=user)
         form.save()
-        response = {'success': True}
+        response = {'success': True, 'rating': user.rating}
 
         return HttpResponse(json.dumps(response), content_type='application/json')
 

company/edit_views.py

@@ -25,7 +25,7 @@ class BaseView(ProfileInvalidView):
             form = self.form_class(self.request.POST, instance=company)
 
         form.save()
-        response = {'success': True}
+        response = {'success': True, 'rating': company.rating}
         return HttpResponse(json.dumps(response), content_type='application/json')
 
 
@@ -50,7 +50,7 @@ class LogoView(BaseView):
         form.save()
         if self.request.is_ajax():
             im = get_thumbnail(company.logo, '100x100', crop='center')
-            response = {'success': True, 'url': im.url}
+            response = {'success': True, 'url': im.url, 'rating': company.rating}
             return HttpResponse(json.dumps(response), content_type='application/json')
         else:
             return HttpResponseRedirect(company.get_permanent_url())

proj/settings.py

@@ -234,7 +234,7 @@ EMAIL_USE_TLS = True
 EMAIL_HOST = 'smtp.gmail.com'
 EMAIL_HOST_USER = 'kotzilla'
 EMAIL_HOST_USER = 'kotzillla@gmail.com'
-EMAIL_HOST_PASSWORD = 'fitteR2006!'
+EMAIL_HOST_PASSWORD = 'fitteR2006!!'
 
 EMAIL_PORT = 587
 DEFAULT_FROM_EMAIL = 'kotzillla@gmail.com'