Changeset 211:fd81e8a20369


Ignore:
Timestamp:
23.12.2009 19:06:48 (2 years ago)
Author:
slav0nic <slav0nic0@…>
Branch:
default
Message:

main app moved from apps/forum to djangobb_forum. Warning: you must renaming DB tables prefix!

Files:
4 edited
78 moved

Legend:

Unmodified
Added
Removed

  • .hgignore

    r177 r211  
    22*.pyc 
    33*.pyo 
     4*.orig 
    45.pydevproject 
    56.project 

  • djangobb/djangobb_forum/admin.py

    r177 r211  
    44from django.contrib.auth.models import User 
    55 
    6 from forum.models import Category, Forum, Topic, Post, Profile, Reputation,\ 
     6from djangobb_forum.models import Category, Forum, Topic, Post, Profile, Reputation,\ 
    77    Report, Ban 
    88 

  • djangobb/djangobb_forum/context_processors.py

    r193 r211  
    1 from forum import settings 
     1from djangobb_forum import settings 
    22 
    33def forum_settings(context): 

  • djangobb/djangobb_forum/feeds.py

    r192 r211  
    55from django.utils.translation import ugettext_lazy as _ 
    66 
    7 from forum.models import Post, Topic, Forum, Category 
     7from djangobb_forum.models import Post, Topic, Forum, Category 
    88 
    99class ForumFeed(Feed): 
    … …  
    1111 
    1212    def link(self): 
    13         return reverse('djangobb:forum.views.index') 
     13        return reverse('djangobb:index') 
    1414 
    1515    def item_guid(self, obj): 

  • djangobb/djangobb_forum/forms.py

    r203 r211  
    1010from django.utils.translation import ugettext as _ 
    1111 
    12 from forum.models import Topic, Post, Profile, Reputation, Report, PrivateMessage,\ 
     12from djangobb_forum.models import Topic, Post, Profile, Reputation, Report, PrivateMessage,\ 
    1313    Forum, Attachment, TZ_CHOICES, PRIVACY_CHOICES 
    14 from forum.markups import mypostmarkup 
    15 from forum import settings as forum_settings 
     14from djangobb_forum.markups import mypostmarkup 
     15from djangobb_forum import settings as forum_settings 
    1616 
    1717 

  • djangobb/djangobb_forum/index.py

    r200 r211  
    11import djapian 
    22 
    3 from forum.models import Post 
     3from djangobb_forum.models import Post 
    44 
    55 

  • djangobb/djangobb_forum/management/commands/unban.py

    r177 r211  
    44from django.core.management.base import BaseCommand, CommandError 
    55from django.contrib.auth.models import User 
    6 from forum.models import Ban 
     6from djangobb_forum.models import Ban 
    77 
    88 

  • djangobb/djangobb_forum/markups/mypostmarkup.py

    r177 r211  
    11import re 
    22 
    3 from forum.markups import postmarkup 
     3from djangobb_forum.markups import postmarkup 
    44 
    55RE_FIRST_LF = re.compile('^\s*\r?\n') 

  • djangobb/djangobb_forum/middleware.py

    r177 r211  
    55from django.conf import settings as global_settings 
    66 
    7 from forum import settings as forum_settings 
     7from djangobb_forum import settings as forum_settings 
    88 
    99class LastLoginMiddleware(object): 

  • djangobb/djangobb_forum/models.py

    r210 r211  
    1111from django.utils.hashcompat import sha_constructor 
    1212 
    13 from forum.markups import mypostmarkup  
    14 from forum.fields import AutoOneToOneField, ExtendedImageField, JSONField 
    15 from forum.util import urlize, smiles 
    16 from forum import settings as forum_settings 
     13from djangobb_forum.markups import mypostmarkup  
     14from djangobb_forum.fields import AutoOneToOneField, ExtendedImageField, JSONField 
     15from djangobb_forum.util import urlize, smiles 
     16from djangobb_forum import settings as forum_settings 
    1717 
    1818TZ_CHOICES = [(float(x[0]), x[1]) for x in ( 

  • djangobb/djangobb_forum/signals.py

    r177 r211  
    22from django.db.models.signals import post_save, pre_save, post_delete 
    33 
    4 from forum.subscription import notify_topic_subscribers, notify_pm_recipients 
    5 from forum.models import Topic, Post, PrivateMessage 
     4from djangobb_forum.subscription import notify_topic_subscribers, notify_pm_recipients 
     5from djangobb_forum.models import Topic, Post, PrivateMessage 
    66 
    77def post_saved(instance, **kwargs): 

  • djangobb/djangobb_forum/subscription.py

    r190 r211  
    44from django.utils.translation import ugettext as _ 
    55 
    6 from forum import settings as forum_settings 
    7 from forum.util import absolute_url 
     6from djangobb_forum import settings as forum_settings 
     7from djangobb_forum.util import absolute_url 
    88 
    99TOPIC_SUBSCRIPTION_TEXT_TEMPLATE = (u"""New reply from %(username)s to topic that you have subscribed on. 
    … …  
    4242 
    4343def notify_topic_subscribers(post): 
    44     from forum.models import Post 
     44    from djangobb_forum.models import Post 
    4545 
    4646    topic = post.topic 
    … …  
    6262def notify_pm_recipients(pm): 
    6363    if not pm.read: 
    64         from forum.models import PrivateMessage  
     64        from djangobb_forum.models import PrivateMessage  
    6565        subject = (u'There are new messages') 
    6666        to_email = pm.dst_user.email 

  • djangobb/djangobb_forum/templatetags/forum_extras.py

    r198 r211  
    1616from django.contrib.humanize.templatetags.humanize import naturalday 
    1717 
    18 from forum.models import Forum, Topic, Post, PostTracking, PrivateMessage, Report 
    19 from forum import settings as forum_settings 
     18from djangobb_forum.models import Forum, Topic, Post, PostTracking, PrivateMessage, Report 
     19from djangobb_forum import settings as forum_settings 
    2020 
    2121register = template.Library() 

  • djangobb/djangobb_forum/tests/__init__.py

    r177 r211  
    44import unittest 
    55 
    6 from forum.tests.postmarkup import PostmarkupTestCase 
     6from djangobb_forum.tests.postmarkup import PostmarkupTestCase 
    77 
    88def suite(): 

  • djangobb/djangobb_forum/tests/postmarkup.py

    r177 r211  
    11import unittest 
    22 
    3 from forum.markups import mypostmarkup 
     3from djangobb_forum.markups import mypostmarkup 
    44 
    55class PostmarkupTestCase(unittest.TestCase): 

  • djangobb/djangobb_forum/urls.py

    r206 r211  
    11from django.conf.urls.defaults import * 
    22 
    3 from forum import settings as forum_settings 
    4 from forum import views as forum_views 
    5 from forum.feeds import LastPosts, LastTopics, LastPostsOnForum,\ 
     3from djangobb_forum import settings as forum_settings 
     4from djangobb_forum import views as forum_views 
     5from djangobb_forum.feeds import LastPosts, LastTopics, LastPostsOnForum,\ 
    66     LastPostsOnCategory, LastPostsOnTopic 
    77 

  • djangobb/djangobb_forum/util.py

    r177 r211  
    1616from django.conf import settings 
    1717 
    18 from forum import settings as forum_settings 
     18from djangobb_forum import settings as forum_settings 
    1919 
    2020 

  • djangobb/djangobb_forum/views.py

    r206 r211  
    1414from django.utils.encoding import smart_str 
    1515 
    16 from forum.util import render_to, paged, build_form, paginate, set_language 
    17 from forum.models import Category, Forum, Topic, Post, Profile, Reputation,\ 
     16from djangobb_forum.util import render_to, paged, build_form, paginate, set_language 
     17from djangobb_forum.models import Category, Forum, Topic, Post, Profile, Reputation,\ 
    1818    Report, PrivateMessage, Attachment, PostTracking 
    19 from forum.forms import AddPostForm, EditPostForm, UserSearchForm,\ 
     19from djangobb_forum.forms import AddPostForm, EditPostForm, UserSearchForm,\ 
    2020    PostSearchForm, ReputationForm, MailToForm, EssentialsProfileForm,\ 
    2121    PersonalProfileForm, MessagingProfileForm, PersonalityProfileForm,\ 
    2222    DisplayProfileForm, PrivacyProfileForm, ReportForm, UploadAvatarForm, CreatePMForm 
    23 from forum.markups import mypostmarkup 
    24 from forum.templatetags import forum_extras 
    25 from forum import settings as forum_settings 
    26 from forum.util import urlize, smiles 
    27 from forum.index import post_indexer 
     23from djangobb_forum.markups import mypostmarkup 
     24from djangobb_forum.templatetags import forum_extras 
     25from djangobb_forum import settings as forum_settings 
     26from djangobb_forum.util import urlize, smiles 
     27from djangobb_forum.index import post_indexer 
    2828 
    2929@render_to('forum/index.html') 
    … …  
    8282                'TEMPLATE': 'forum/move_topic.html' 
    8383            } 
    84             return HttpResponseRedirect(reverse('djangobb:index')) 
    8584        elif 'delete_topics' in request.POST: 
    8685            for topic_id in topic_list: 
    … …  
    531530@render_to('forum/edit_post.html') 
    532531def edit_post(request, post_id): 
    533     from forum.templatetags.forum_extras import forum_editable_by 
     532    from djangobb_forum.templatetags.forum_extras import forum_editable_by 
    534533 
    535534    post = get_object_or_404(Post, pk=post_id) 
    … …  
    550549@paged('posts', forum_settings.TOPIC_PAGE_SIZE) 
    551550def delete_posts(request, topic_id): 
    552     from forum.templatetags.forum_extras import forum_moderated_by 
     551    from djangobb_forum.templatetags.forum_extras import forum_moderated_by 
    553552 
    554553    topic = Topic.objects.select_related().get(pk=topic_id) 
    … …  
    600599@render_to('forum/move_topic.html') 
    601600def move_topic(request): 
    602     from forum.templatetags.forum_extras import forum_moderated_by 
     601    from djangobb_forum.templatetags.forum_extras import forum_moderated_by 
    603602    first_topic = topic_ids = list(request.GET['topic_id']) 
    604603    if len(topic_ids) > 1: 
    … …  
    637636@login_required 
    638637def stick_topic(request, topic_id): 
    639     from forum.templatetags.forum_extras import forum_moderated_by 
     638    from djangobb_forum.templatetags.forum_extras import forum_moderated_by 
    640639 
    641640    topic = get_object_or_404(Topic, pk=topic_id) 
    … …  
    649648@login_required 
    650649def unstick_topic(request, topic_id): 
    651     from forum.templatetags.forum_extras import forum_moderated_by 
     650    from djangobb_forum.templatetags.forum_extras import forum_moderated_by 
    652651 
    653652    topic = get_object_or_404(Topic, pk=topic_id) 
    … …  
    692691@login_required 
    693692def close_topic(request, topic_id): 
    694     from forum.templatetags.forum_extras import forum_moderated_by 
     693    from djangobb_forum.templatetags.forum_extras import forum_moderated_by 
    695694 
    696695    topic = get_object_or_404(Topic, pk=topic_id) 
    … …  
    703702@login_required 
    704703def open_topic(request, topic_id): 
    705     from forum.templatetags.forum_extras import forum_moderated_by 
     704    from djangobb_forum.templatetags.forum_extras import forum_moderated_by 
    706705 
    707706    topic = get_object_or_404(Topic, pk=topic_id) 

  • djangobb/settings.py

    r207 r211  
    55 
    66PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__)) 
    7 sys.path.append(os.path.join(PROJECT_ROOT, 'apps')) 
    87 
    98DEBUG = True 
    … …  
    9493    'django_authopenid.middleware.OpenIDMiddleware', 
    9594    'django.middleware.cache.FetchFromCacheMiddleware', 
    96     'forum.middleware.LastLoginMiddleware', 
    97     'forum.middleware.UsersOnline', 
     95    'djangobb_forum.middleware.LastLoginMiddleware', 
     96    'djangobb_forum.middleware.UsersOnline', 
    9897) 
    9998 
    … …  
    117116    'registration', 
    118117    'django_authopenid', 
    119     'forum', 
     118    'djangobb_forum', 
    120119    'djapian', 
    121120) 
    … …  
    130129    'django.core.context_processors.request', 
    131130    'django_authopenid.context_processors.authopenid', 
    132     'forum.context_processors.forum_settings' 
     131    'djangobb_forum.context_processors.forum_settings' 
    133132) 
    134133 

  • djangobb/sitemap.py

    r195 r211  
    11from django.contrib.sitemaps import Sitemap 
    2 from forum.models import Forum, Topic 
     2from djangobb_forum.models import Forum, Topic 
    33 
    44 

  • djangobb/urls.py

    r195 r211  
    3030    # Apps 
    3131    (r'^forum/account/', include(authopenid_urlpatterns)), 
    32     (r'^forum/', include('forum.urls', namespace='djangobb')), 
     32    (r'^forum/', include('djangobb_forum.urls', namespace='djangobb')), 
    3333) 
    3434 
Note: See TracChangeset for help on using the changeset viewer.