Changeset - f6bbcc7ee328
[Not reviewed]
0 18 0
Bradley Kuhn (bkuhn) - 7 years ago 2015-03-09 00:54:05
bkuhn@ebb.org
Just quit it with this relative import stuff.

While I think these relative imports seem to be valid for the running
application, I am having trouble with the django-admin applications
regarding them. I don't see this syntactic sugar as absolutely
essential, so I'm just going to change it now.
18 files changed with 20 insertions and 20 deletions:
0 comments (0 inline, 0 general)
www/conservancy/apps/blog/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import EntryTag, Entry
 
from conservancy.apps.blog.models import EntryTag, Entry
 

	
 
class EntryTagAdmin(admin.ModelAdmin):
 
    prepopulated_fields = {'slug': ('label',)}
 

	
 
admin.site.register(EntryTag, EntryTagAdmin)
 

	
www/conservancy/apps/blog/urls.py
Show inline comments
 
from django.conf.urls import patterns, url, include
 
from models import Entry, EntryTag # relative import
 
from conservancy.apps.blog.models import Entry, EntryTag # relative import
 
from conservancy.apps.staff.models import Person
 
from datetime import datetime
 
from views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView
 
from conservancy.apps.blog.views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView
 

	
 
extra_context = {}
 

	
 
info_dict = {
 
    'queryset': Entry.objects.all(),
 
    'date_field': 'pub_date',
www/conservancy/apps/blog/views.py
Show inline comments
 
from models import Entry, EntryTag # relative import
 
from conservancy.apps.blog.models import Entry, EntryTag # relative import
 
# from django.views.generic.list_detail import object_list
 
from django.views.generic import ListView
 
from django.views.generic.dates import YearArchiveView, MonthArchiveView, DayArchiveView, DateDetailView
 
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
from conservancy.apps.staff.models import Person
 
from django.shortcuts import get_object_or_404, render_to_response
www/conservancy/apps/contacts/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import ContactEntry
 
from conservancy.apps.contacts.models import ContactEntry
 

	
 
class ContactEntryAdmin(admin.ModelAdmin):
 
    list_display = ('email', 'subscribe_conservancy')
 

	
 

	
 
admin.site.register(ContactEntry, ContactEntryAdmin)
www/conservancy/apps/contacts/views.py
Show inline comments
 
from django.shortcuts import render_to_response
 
from django import forms
 
from models import ContactEntry
 
from conservancy.app.contacts.models import ContactEntry
 
from django.forms import ModelForm
 

	
 
def subscribe(request):
 
    """Mailing list subscription form
 
    """
 

	
www/conservancy/apps/events/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import EventTag, Event, EventMedia
 
from conservancy.apps.event.models import EventTag, Event, EventMedia
 

	
 
admin.site.register(EventTag)
 

	
 
class EventAdmin(admin.ModelAdmin):
 
    list_display = ("title", "date", "date_tentative", "location")
 
    list_filter = ['date']
www/conservancy/apps/events/urls.py
Show inline comments
 
from django.conf.urls import patterns, url, include
 
from models import Event # relative import
 
from conservancy.apps.events.models import Event
 

	
 
info_dict = {
 
    'queryset': Event.objects.all(),
 
    'date_field': 'date',
 
    'allow_future': True,
 
}
www/conservancy/apps/events/views.py
Show inline comments
 
# from django.views.generic.list_detail import object_list
 
from django.shortcuts import render_to_response
 
from django.http import Http404, HttpResponse
 
from django.template import loader
 
from django.core.exceptions import ObjectDoesNotExist
 
from models import Event # relative import
 
from conservancy.apps.events.models import Event
 
# for debugging...
 
from django.http import HttpResponse
 

	
 
def event_detail(request, year, slug, queryset, **kwargs):
 
    """This view shows event detail.
 

	
www/conservancy/apps/fundgoal/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import FundraisingGoal
 
from conservancy.apps.fundgoal.models import FundraisingGoal
 

	
 
class FundraisingGoalAdmin(admin.ModelAdmin):
 
    list_display = ('display_name', 'display_until_date')
 

	
 
admin.site.register(FundraisingGoal, FundraisingGoalAdmin)
www/conservancy/apps/fundgoal/views.py
Show inline comments
 
from models import FundraisingGoal # relative import
 
from conservancy.apps.fundgoal.models import FundraisingGoal
 
from django.shortcuts import get_object_or_404, render_to_response
www/conservancy/apps/news/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import PressRelease, ExternalArticleTag, ExternalArticle
 
from conservancy.apps.news.models import PressRelease, ExternalArticleTag, ExternalArticle
 

	
 
class PressReleaseAdmin(admin.ModelAdmin):
 
    list_display = ("headline", "pub_date")
 
    list_filter = ['pub_date']
 
    date_hierarchy = 'pub_date'
 
    search_fields = ['headline', 'summary', 'body']
www/conservancy/apps/news/urls.py
Show inline comments
...
 
@@ -16,14 +16,14 @@
 
# You should have received a copy of the GNU Affero General Public License
 
# along with this program in a file in the toplevel directory called
 
# "AGPLv3".  If not, see <http://www.gnu.org/licenses/>.
 

	
 
from django.conf.urls import patterns, url, include
 
from django.conf import settings
 
from models import PressRelease, ExternalArticle # relative import
 
from views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView
 
from conservancy.app.news.models import PressRelease, ExternalArticle
 
from conservancy.apps.news.views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView
 

	
 
info_dict = {
 
    'queryset': PressRelease.objects.all().filter(sites__id__exact=settings.SITE_ID),
 
    'date_field': 'pub_date',
 
}
 

	
www/conservancy/apps/staff/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import Person
 
from conservancy.apps.staff.models import Person
 

	
 
class PersonAdmin(admin.ModelAdmin):
 
    list_display = ("username", "formal_name", "casual_name",
 
                    "currently_employed")
 
    list_filter = ["currently_employed"]
 

	
www/conservancy/apps/summit_registration/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import SummitRegistration
 
from conservancy.apps.summit_registration.models import SummitRegistration
 

	
 
class SummitRegistrationAdmin(admin.ModelAdmin):
 
    list_display = ('name', 'email', 'affiliation', 'cle_credit')
 

	
 
admin.site.register(SummitRegistration, SummitRegistrationAdmin)
 

	
www/conservancy/apps/summit_registration/views.py
Show inline comments
 
from django.shortcuts import render_to_response
 
from django import forms
 
from models import SummitRegistration
 
from conervancy.apps.summit_registration.models import SummitRegistration
 

	
 
def register(request):
 
    """Summit registration form view
 
    """
 

	
 
    class SummitForm(ModelForm):
www/conservancy/apps/supporters/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import Supporter
 
from conservancy.app.Supporter.models import Supporter
 

	
 
class SupporterAdmin(admin.ModelAdmin):
 
    list_display = ('display_name', 'display_until_date')
 

	
 
admin.site.register(Supporter, SupporterAdmin)
www/conservancy/apps/supporters/views.py
Show inline comments
 
from models import Supporter # relative import
 
from conservancy.apps.supporters.models import Supporter
 
from django.shortcuts import get_object_or_404, render_to_response
 

	
www/conservancy/apps/worldmap/admin.py
Show inline comments
 
from django.contrib import admin
 
from models import EarthLocation
 
from conservancy.apps.worldmap.models import EarthLocation
 

	
 
class EarthLocationAdmin(admin.ModelAdmin):
 
    list_display = ("label", "html_map_link")
 

	
 
admin.site.register(EarthLocation, EarthLocationAdmin)
0 comments (0 inline, 0 general)