mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Task 30

Browse Source
remotes/origin/1203
Назар Котюк 11 years ago
parent a4c804348d
commit 058c95584b
4 changed files with 49 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      company/edit_views.py
  2. 34
      company/urls.py
  3. 2
      templates/client/company/company_detail.html
  4. 39
      templates/client/includes/company/company_edit.html

12
company/edit_views.py
Unescape View File

@ -1,13 +1,21 @@
import json
from django.http import HttpResponseRedirect, HttpResponse, Http404
from django.http import HttpResponseRedirect, HttpResponse, Http404, HttpResponseForbidden
from django.utils.translation import get_language
from sorl.thumbnail import get_thumbnail
from edit_forms import *
from accounts.views import ProfileInvalidView
from .models import Company
class BaseView(ProfileInvalidView):
def form_valid(self, form):
company = self.request.user.company
slug = self.kwargs.get('slug')
if not slug:
raise Http404
company = Company.objects.get(url=slug)
if company.creator_id != self.request.user.id:
return HttpResponseForbidden()
if self.form_class.translation:
lang = get_language()
comp_transl = company.translations.get(language_code=lang)

34
company/urls.py
Unescape View File

@ -6,6 +6,10 @@ from edit_views import *
urlpatterns = patterns('',
url(r'company/create-company/$', 'company.views.create_company'),
url(r'company/get-company/$', 'company.views.get_company'),
#
url(r'members/search/$', CompanySearchView.as_view()),
#url(r'members/(?P<params>.*)/(?P<page>\d+)/$', CompanyView.as_view()),
#url(r'members/(?P<page>\d+)/$', CompanyView.as_view()),
@ -20,21 +24,19 @@ urlpatterns = patterns('',
url(r'members/$', MemberList.as_view()),
#
url(r'company/create-company/$', 'company.views.create_company'),
url(r'company/get-company/$', 'company.views.get_company'),
#
url(r'company/update/name/$', login_required(NameView.as_view())),
url(r'^company/update/home/$', login_required(HomeView.as_view())),
url(r'^company/update/specialization/$', login_required(SpecializationView.as_view())),
url(r'^company/update/phone/$', login_required(PhoneView.as_view())),
url(r'^company/update/email/$', login_required(EmailView.as_view())),
url(r'^company/update/web-page/$', login_required(WebPageView.as_view())),
url(r'^company/update/social/$', login_required(SocialView.as_view())),
url(r'^company/update/tag/$', login_required(TagView.as_view())),
url(r'^company/update/foundation/$', login_required(FoundationView.as_view())),
url(r'^company/update/staff/$', login_required(StaffView.as_view())),
url(r'^company/update/description/$', login_required(DescriptionView.as_view())),
url(r'^company/update/address/$', login_required(AddressView.as_view())),
url(r'^company/update/logo/$', login_required(LogoView.as_view())),
url(r'company/update/name/(?P<slug>.*)/$', login_required(NameView.as_view())),
url(r'^company/update/home/(?P<slug>.*)/$', login_required(HomeView.as_view())),
url(r'^company/update/specialization/(?P<slug>.*)/$', login_required(SpecializationView.as_view())),
url(r'^company/update/phone/(?P<slug>.*)/$', login_required(PhoneView.as_view())),
url(r'^company/update/email/(?P<slug>.*)/$', login_required(EmailView.as_view())),
url(r'^company/update/web-page/(?P<slug>.*)/$', login_required(WebPageView.as_view())),
url(r'^company/update/social/(?P<slug>.*)/$', login_required(SocialView.as_view())),
url(r'^company/update/tag/(?P<slug>.*)/$', login_required(TagView.as_view())),
url(r'^company/update/foundation/(?P<slug>.*)/$', login_required(FoundationView.as_view())),
url(r'^company/update/staff/(?P<slug>.*)/$', login_required(StaffView.as_view())),
url(r'^company/update/description/(?P<slug>.*)/$', login_required(DescriptionView.as_view())),
url(r'^company/update/address/(?P<slug>.*)/$', login_required(AddressView.as_view())),
url(r'^company/update/logo/(?P<slug>.*)/$', login_required(LogoView.as_view())),
)

2
templates/client/company/company_detail.html
Unescape View File

@ -15,7 +15,7 @@
{% block content_list %}
{% if request.user == object.creator %}
{% include 'client/includes/company/company_edit.html' %}
{% include 'client/includes/company/company_edit.html' with company=object %}
{% else %}
{% include 'client/includes/company/company_object.html' with company=object %}
{% endif %}

39
templates/client/includes/company/company_edit.html
Unescape View File

@ -42,7 +42,7 @@
<a class="e-btn" href="#" title="">Указать</a>
<div class="add_link_text_text">свой город <b>+5</b></div>
{% endif %}
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %}
<div class="e-form">
@ -76,8 +76,8 @@
</div>
<div class="site_link">
<a href="{{ request.user.company.get_permanent_url }}" title="">
{{ request.user.company.get_permanent_url }}
<a href="{{ company.get_permanent_url }}" title="">
{{ company.get_permanent_url }}
</a>
</div>
@ -87,7 +87,7 @@
<div class="edit-wrap">
<a class="e-btn" href="#">редактировать</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/company/update/name/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="name_form" action="/company/update/name/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -126,7 +126,7 @@
{% endif %}
<div class="e-form">
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epf-field">
@ -148,12 +148,13 @@
</div>
</div>
<div class="i-area" id="theme-inf" data-theme="{% for th in request.user.company.theme.all %}{{ th.id }},{% endfor %}">
{% for th in request.user.company.theme.all %}
<a href="/members/theme-{{ th.url }}">{{ th.name }}</a>{% ifnotequal forloop.counter request.user.company.theme.all|length %},{% endifnotequal %}
{% endfor %}
</div>
{% with themes=company.theme.all %}
<div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
{% for th in themes %}
<a href="/members/theme/{{ th.url }}">{{ th.name }}</a>{% ifnotequal forloop.counter themes|length %},{% endifnotequal %}
{% endfor %}
</div>
{% endwith %}
<hr />
@ -171,7 +172,7 @@
{% endif %}
<div class="e-form">
<form class="clearfix update-profile-form" id="address_form" action="/company/update/address/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="address_form" action="/company/update/address/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -260,7 +261,7 @@
<div class="add_link_text_text"><b>+5 за каждый</b></div>
<div class="e-form">
<form class="clearfix update-profile-form" id="social_form" action="/company/update/social/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="social_form" action="/company/update/social/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -323,7 +324,7 @@
{% endif %}
<div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -359,7 +360,7 @@
{% endif %}
<div class="e-form">
<form class="clearfix update-profile-form" id="email_form" action="/company/update/email/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="email_form" action="/company/update/email/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -398,7 +399,7 @@
{% endif %}
<div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -441,7 +442,7 @@
<div class="e-form">
<form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -477,7 +478,7 @@
<div class="e-form">
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -513,7 +514,7 @@
<div class="e-form">
<form class="clearfix update-profile-form" id="description_form" action="/company/update/description/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="description_form" action="/company/update/description/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">

Write Preview
Loading…
Cancel
Save