Created
April 12, 2012 17:35
-
-
Save ecogswell/2369464 to your computer and use it in GitHub Desktop.
affiliations fixes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/marketplace/affiliations/admin.py b/marketplace/affiliations/admin.py | |
index 87f3e01..f5ad40e 100644 | |
--- a/marketplace/affiliations/admin.py | |
+++ b/marketplace/affiliations/admin.py | |
@@ -10,6 +10,7 @@ class AffiliationAdmin(BaseModelAdmin): | |
search_fields = ('name',) | |
prepopulated_fields = {'slug': ('name',)} | |
list_filter = ('type', 'featured',) | |
+ raw_id_fields = ('created_by',) | |
form = AffiliationAddForm | |
diff --git a/templates/default/marketplace/includes/businesses/business_tabs.html b/templates/default/marketplace/includes/businesses/business_tabs.html | |
index da78ae5..e8bae9e 100644 | |
--- a/templates/default/marketplace/includes/businesses/business_tabs.html | |
+++ b/templates/default/marketplace/includes/businesses/business_tabs.html | |
@@ -79,13 +79,6 @@ | |
{% include "marketplace/includes/businesses/payment_options.html" %} | |
- <ul class="affiliations"> | |
- {% for affil in business.affiliation_set.all %} | |
- <li>{{ affil }}</li> | |
- {% endfor %} | |
- </ul> | |
- | |
- | |
{% if business.get_profile.has_business_features %}{% if business.fax %}<p><strong>{% trans "Fax" %}:</strong> {{ business.fax }}</p>{% endif %}{% endif %} | |
{% if business.phone2 %}<p><strong>{% trans "Alternate Phone" %}:</strong> {{ business.phone2 }}</p>{% endif %} | |
@@ -133,17 +126,6 @@ | |
{% with business.professional as professional %} | |
- {% if professional.affiliations.count %} | |
- <div class="affiliations"> | |
- <h3>{% trans "Business affiliations" %}</h3> | |
- <ul> | |
- {% for affiliation in professional.affiliations.all %} | |
- <li>{{ affiliation }}{% if affiliation.start_date %}, {{ affiliation.start_date|date:"Y" }} - {% endif %}{% if affiliation.start_date and not affiliation.end_date %} {% trans "present" %}{% else %}{{ affiliation.end_date|date:"Y" }}{% endif %}</li> | |
- {% endfor %} | |
- </ul> | |
- </div> | |
- {% endif %} | |
- | |
{% if business.staff.count %} | |
<div class="related_professionals"> | |
<h3>{% trans "Related professionals" %}</h3> | |
diff --git a/templates/default/marketplace/includes/businesses/business_tools.html b/templates/default/marketplace/includes/businesses/business_tools.html | |
index 7b55e1f..dd05790 100644 | |
--- a/templates/default/marketplace/includes/businesses/business_tools.html | |
+++ b/templates/default/marketplace/includes/businesses/business_tools.html | |
@@ -26,7 +26,6 @@ | |
{% if business.business_type.codename == "professional" %} | |
<li class="profession"><a href="{{ business.get_absolute_url }}profession/">{% trans "Profession" %}</a></li> | |
<li class="credentials"><a href="{{ business.get_absolute_url }}credentials/add/">{% trans "Credentials" %}</a></li> | |
- <li class="affiliations"><a href="{{ business.get_absolute_url }}affiliations/add/">{% trans "Affiliations" %}</a></li> | |
<li class="specialties"><a href="{{ business.get_absolute_url }}specialties/">{% trans "Specialties" %}</a></li> | |
<li class="related_businesses"><a href="{{ business.get_absolute_url }}businesses/">{% trans "Related businesses" %}</a></li> | |
{% endif %} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment