Changeset - f7e45da6ddc8
[Not reviewed]
www/conservancy/apps/blog/models.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from django.db import models
 
from django.conf import settings
 
from sflc.apps.staff.models import Person
 
from conservancy.apps.staff.models import Person
 
from datetime import datetime, timedelta
...
 
@@ -55,3 +55,3 @@ class Entry(models.Model):
 
    def save(self):
 
        if settings.SFLC_DEVEL or True: # "or True" means it is disabled always
 
        if settings.CONSERVANCY_DEVEL or True: # "or True" means it is disabled always
 
            super(Entry, self).save()
www/conservancy/apps/blog/urls.py
Show inline comments
...
 
@@ -3,3 +3,3 @@ from models import Entry, EntryTag # relative import
 
from views import last_name # relative import
 
from sflc.apps.staff.models import Person
 
from conservancy.apps.staff.models import Person
 
from datetime import datetime
...
 
@@ -22,3 +22,3 @@ urlpatterns = patterns('django.views.generic.date_based',
 

	
 
urlpatterns += patterns('sflc.apps.blog.views',
 
urlpatterns += patterns('conservancy.apps.blog.views',
 
   (r'^/?$', 'custom_index', dict(info_dict, paginate_by=10)),
www/conservancy/apps/blog/views.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from models import Entry, EntryTag # relative import
 
from django.views.generic.list_detail import object_list
 
from sflc.apps.staff.models import Person
 
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
...
 
@@ -4,3 +4,3 @@ from models import ContactEntry
 
class ContactEntryAdmin(admin.ModelAdmin):
 
    list_display = ('email', 'subscribe_sflc', 'subscribe_sfc')
 
    list_display = ('email', 'subscribe_conservancy')
 

	
www/conservancy/apps/contacts/models.py
Show inline comments
...
 
@@ -3,3 +3,3 @@ from django.db import models
 
class ContactEntry(models.Model):
 
    """SFLC contact system
 
    """Conservancy contact system
 

	
...
 
@@ -8,4 +8,3 @@ class ContactEntry(models.Model):
 
    email = models.EmailField() # should make it unique, but we really cannot
 
    subscribe_sflc = models.BooleanField()
 
    subscribe_sfc = models.BooleanField()
 
    subscribe_conservancy = models.BooleanField()
 

	
www/conservancy/apps/contacts/urls.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from django.conf.urls.defaults import *
 

	
 
urlpatterns = patterns('sflc.apps.contacts.views',
 
urlpatterns = patterns('conservancy.apps.contacts.views',
 
   (r'^/?$', 'subscribe'),
www/conservancy/apps/contacts/views.py
Show inline comments
...
 
@@ -13,4 +13,3 @@ def subscribe(request):
 

	
 
    ContactEntryForm.base_fields['subscribe_sflc'].label = 'Receive Software Freedom Law Center updates'
 
    ContactEntryForm.base_fields['subscribe_sfc'].label = 'Receive Software Freedom Conservancy updates'
 
    ContactEntryForm.base_fields['subscribe_conservancy'].label = 'Receive Software Freedom Conservancy updates'
 

	
www/conservancy/apps/events/models.py
Show inline comments
 
from django.db import models
 
from sflc.apps.staff.models import Person
 
from sflc.apps.worldmap.models import EarthLocation
 
from conservancy.apps.staff.models import Person
 
from conservancy.apps.worldmap.models import EarthLocation
 
from datetime import datetime, timedelta
...
 
@@ -31,3 +31,3 @@ class FutureEventManager(models.Manager):
 
class Event(models.Model):
 
    """Model for SFLC staff member events (presentations, etc)"""
 
    """Model for Conservancy staff member events (presentations, etc)"""
 

	
www/conservancy/apps/events/urls.py
Show inline comments
...
 
@@ -14,3 +14,3 @@ urlpatterns = patterns('django.views.generic.date_based',
 

	
 
urlpatterns += patterns('sflc.apps.events.views',
 
urlpatterns += patterns('conservancy.apps.events.views',
 
    (r'^/?$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)),
www/conservancy/apps/news/models.py
Show inline comments
...
 
@@ -2,4 +2,4 @@ from django.db import models
 
from django.conf import settings
 
from sflc.apps.staff.models import Person
 
from sflc.apps.events.models import Event
 
from conservancy.apps.staff.models import Person
 
from conservancy.apps.events.models import Event
 
from django.contrib.sites.models import Site
...
 
@@ -39,3 +39,3 @@ class PressRelease(models.Model):
 
        # This function is deprecated.  Use the date_within template
 
        # filter instead (example in sflc/templates/frontpage.html)
 
        # filter instead (example in conservancy/templates/frontpage.html)
 
        return self.pub_date > (datetime.now() - timedelta(days=30))
...
 
@@ -43,3 +43,3 @@ class PressRelease(models.Model):
 
    def save(self):
 
        if settings.SFLC_DEVEL or True:
 
        if settings.CONSERVANCY_DEVEL or True:
 
            super(PressRelease, self).save()
...
 
@@ -80,3 +80,3 @@ class PublicExternalArticleManager(models.Manager):
 
class ExternalArticle(models.Model):
 
    """A system for displaying SFLC news mentions on the site.
 
    """A system for displaying Conservancy news mentions on the site.
 

	
www/conservancy/apps/news/views.py
Show inline comments
 
from django.views.generic.list_detail import object_list
 
from sflc.apps.news.models import ExternalArticle
 
from sflc.apps.events.models import Event
 
from conservancy.apps.news.models import ExternalArticle
 
from conservancy.apps.events.models import Event
 
from datetime import datetime
www/conservancy/apps/podcast/models.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from django.db import models
 
from django.conf import settings
 
from sflc.apps.staff.models import Person
 
from conservancy.apps.staff.models import Person
 
from datetime import datetime, timedelta
www/conservancy/apps/podcast/urls.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from django.conf.urls.defaults import *
 
from models import Podcast, PodcastTag # relative import
 
from sflc.apps.staff.models import Person
 
from conservancy.apps.staff.models import Person
 
from datetime import datetime
...
 
@@ -23,3 +23,3 @@ urlpatterns = patterns('django.views.generic.date_based',
 

	
 
urlpatterns += patterns('sflc.apps.podcast.views',
 
urlpatterns += patterns('conservancy.apps.podcast.views',
 
   (r'^/?$', 'custom_index', dict(info_dict, paginate_by=20)),
www/conservancy/apps/podcast/views.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from models import Podcast, PodcastTag # relative import
 
from django.views.generic.list_detail import object_list
 
from sflc.apps.staff.models import Person
 
from conservancy.apps.staff.models import Person
 
from django.shortcuts import get_object_or_404, render_to_response
www/conservancy/apps/summit_registration/urls.py
Show inline comments
...
 
@@ -2,3 +2,3 @@ from django.conf.urls.defaults import *
 

	
 
urlpatterns = patterns('sflc.apps.summit_registration.views',
 
urlpatterns = patterns('conservancy.apps.summit_registration.views',
 
   (r'^/?$', 'register'),
0 comments (0 inline, 0 general)