1753: СРОЧНАЯ ДОРАБОТКА 1

remotes/origin/stage5
Alexander Burdeinyi 9 years ago
parent b210a2d222
commit aab439febe
  1. 2
      company/urls.py
  2. 5
      company/views.py
  3. 6
      static/client/js/_modules/page.profile.js
  4. 2
      static/client/js_min/_modules/page.profile.min.js

@ -18,7 +18,7 @@ urlpatterns = patterns('',
url(r'members/tag/(?P<slug>.*)/page/(?P<page>\d+)/$', MemberTagList.as_view(), {'meta_id':70}), url(r'members/tag/(?P<slug>.*)/page/(?P<page>\d+)/$', MemberTagList.as_view(), {'meta_id':70}),
url(r'members/tag/(?P<slug>.*)/$', MemberTagList.as_view(), {'meta_id':70}), url(r'members/tag/(?P<slug>.*)/$', MemberTagList.as_view(), {'meta_id':70}),
url(r'members/page/(?P<page>\d+)/$', MemberList.as_view(), {'meta_id':67}), url(r'members/page/(?P<page>\d+)/$', MemberList.as_view(), {'meta_id':67}),
url(r'members/(?P<slug>.*)/$', MemberDetail.as_view(), {'meta_id':68}), url(r'members/(?P<slug>.*)/$', MemberDetail.as_view(), {'meta_id':68}, name='company-detail'),
url(r'members/$', MemberList.as_view(), {'meta_id':67}), url(r'members/$', MemberList.as_view(), {'meta_id':67}),
# #

@ -1,5 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json import json
from django.core.urlresolvers import reverse
from django.http import HttpResponse from django.http import HttpResponse
from django.conf import settings from django.conf import settings
from django.views.generic import DetailView from django.views.generic import DetailView
@ -108,8 +110,9 @@ def create_company(request):
response = {'success': False} response = {'success': False}
form = CreateCompanyForm(request.POST) form = CreateCompanyForm(request.POST)
if form.is_valid(): if form.is_valid():
form.save(request.user) company = form.save(request.user)
response['success'] = True response['success'] = True
response['redirect_url'] = reverse('company-detail', args=[company.url])
return HttpResponse(json.dumps(response), content_type='application/json') return HttpResponse(json.dumps(response), content_type='application/json')
else: else:
response['errors'] = form.errors response['errors'] = form.errors

@ -413,7 +413,11 @@ if (EXPO.profile){
*/ */
this.afterSubmitHandler = function (data) { this.afterSubmitHandler = function (data) {
if (data.success){ if (data.success){
location.reload(); if (data.redirect_url) {
window.location = data.redirect_url;
} else {
location.reload();
}
}else{ }else{

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save