From 2941aa8fb785319b5734a584ed464c1dcec8e099 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Wed, 26 Aug 2015 09:58:46 +0200 Subject: [PATCH] Upgrade to Django 1.8 --- .settings/org.eclipse.core.resources.prefs | 1 - VIPSWeb/settings.py | 4 ++-- VIPSWeb/templates/index.html | 2 +- VIPSWeb/urls.py | 2 +- VIPSWeb/views.py | 2 +- messages/__init__.py | 0 requirements.txt | 2 +- vips_messages/__init__.py | 1 + {messages => vips_messages}/admin.py | 0 vips_messages/apps.py | 5 +++++ {messages => vips_messages}/forms.py | 0 .../locale/bg/LC_MESSAGES/django.mo | Bin .../locale/bg/LC_MESSAGES/django.po | 0 .../locale/bs/LC_MESSAGES/django.mo | Bin .../locale/bs/LC_MESSAGES/django.po | 0 .../locale/nb/LC_MESSAGES/django.mo | Bin .../locale/nb/LC_MESSAGES/django.po | 0 {messages => vips_messages}/models.py | 0 .../templates/messages/detail.html | 0 .../templates/messages/index.html | 2 +- {messages => vips_messages}/tests.py | 0 {messages => vips_messages}/urls.py | 2 +- {messages => vips_messages}/views.py | 4 ++-- 23 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 messages/__init__.py create mode 100644 vips_messages/__init__.py rename {messages => vips_messages}/admin.py (100%) create mode 100644 vips_messages/apps.py rename {messages => vips_messages}/forms.py (100%) rename {messages => vips_messages}/locale/bg/LC_MESSAGES/django.mo (100%) rename {messages => vips_messages}/locale/bg/LC_MESSAGES/django.po (100%) rename {messages => vips_messages}/locale/bs/LC_MESSAGES/django.mo (100%) rename {messages => vips_messages}/locale/bs/LC_MESSAGES/django.po (100%) rename {messages => vips_messages}/locale/nb/LC_MESSAGES/django.mo (100%) rename {messages => vips_messages}/locale/nb/LC_MESSAGES/django.po (100%) rename {messages => vips_messages}/models.py (100%) rename {messages => vips_messages}/templates/messages/detail.html (100%) rename {messages => vips_messages}/templates/messages/index.html (98%) rename {messages => vips_messages}/tests.py (100%) rename {messages => vips_messages}/urls.py (96%) rename {messages => vips_messages}/views.py (94%) diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 91295c10..a4eb737e 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,3 @@ eclipse.preferences.version=1 -encoding//VIPSWeb/local_settings.py=UTF-8 encoding//common/util.py=utf-8 encoding//forecasts/models.py=utf-8 diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py index f03643ff..5366f8df 100644 --- a/VIPSWeb/settings.py +++ b/VIPSWeb/settings.py @@ -106,7 +106,7 @@ TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. - os.path.join(SITE_ROOT, 'templates') + os.path.join(SITE_ROOT, 'templates'), ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -129,7 +129,7 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'tinymce', 'forecasts', - 'messages', + 'vips_messages', 'organisms', 'information', 'cerealblotchmodels', diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html index 44d448bc..e39ad706 100644 --- a/VIPSWeb/templates/index.html +++ b/VIPSWeb/templates/index.html @@ -100,7 +100,7 @@ {% for message in messages_by_tag|lookup:message_tag.message_tag_id %} <tr> <td class="dateCell">{{ message.date_pub|date:"Y-m-d" }}</td> - <td><a href="{% url 'messages:detail' message.message_id %}">{{message.heading}}</a></td> + <td><a href="{% url 'vips_messages:detail' message.message_id %}">{{message.heading}}</a></td> </tr> {% endfor %} </tbody> diff --git a/VIPSWeb/urls.py b/VIPSWeb/urls.py index fd1a58df..6c7bfd96 100644 --- a/VIPSWeb/urls.py +++ b/VIPSWeb/urls.py @@ -41,7 +41,7 @@ urlpatterns = patterns('', # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^forecasts/', include('forecasts.urls', namespace = "forecasts")), - url(r'^messages/', include('messages.urls', namespace = "messages")), + url(r'^messages/', include('vips_messages.urls', namespace = "vips_messages")), url(r'^organisms/', include('organisms.urls', namespace = "organisms")), url(r'^information/', include('information.urls', namespace = "information")), url(r'^blotch/', include('cerealblotchmodels.urls', namespace = "cerealblotchmodels")), diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py index 5c0228dc..218f0f74 100644 --- a/VIPSWeb/views.py +++ b/VIPSWeb/views.py @@ -19,7 +19,7 @@ from django.shortcuts import render from django.conf import settings from django.utils import translation -from messages.models import Message, MessageTag +from vips_messages.models import Message, MessageTag from organisms.models import CropGroup def index(request): diff --git a/messages/__init__.py b/messages/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/requirements.txt b/requirements.txt index d26ac3f7..006a05f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ # Please add requirements here # Read docs for how this works: http://www.pip-installer.org/en/latest/cookbook.html -Django==1.6.1 +Django==1.8 Pillow requests==2.0.1 django-tinymce diff --git a/vips_messages/__init__.py b/vips_messages/__init__.py new file mode 100644 index 00000000..0658db54 --- /dev/null +++ b/vips_messages/__init__.py @@ -0,0 +1 @@ +default_app_config = 'vips_messages.apps.VIPSMessagesConfig' \ No newline at end of file diff --git a/messages/admin.py b/vips_messages/admin.py similarity index 100% rename from messages/admin.py rename to vips_messages/admin.py diff --git a/vips_messages/apps.py b/vips_messages/apps.py new file mode 100644 index 00000000..23e0313e --- /dev/null +++ b/vips_messages/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + +class VIPSMessagesConfig(AppConfig): + name = 'vips_messages' + verbose_name = "VIPS messages" \ No newline at end of file diff --git a/messages/forms.py b/vips_messages/forms.py similarity index 100% rename from messages/forms.py rename to vips_messages/forms.py diff --git a/messages/locale/bg/LC_MESSAGES/django.mo b/vips_messages/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from messages/locale/bg/LC_MESSAGES/django.mo rename to vips_messages/locale/bg/LC_MESSAGES/django.mo diff --git a/messages/locale/bg/LC_MESSAGES/django.po b/vips_messages/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from messages/locale/bg/LC_MESSAGES/django.po rename to vips_messages/locale/bg/LC_MESSAGES/django.po diff --git a/messages/locale/bs/LC_MESSAGES/django.mo b/vips_messages/locale/bs/LC_MESSAGES/django.mo similarity index 100% rename from messages/locale/bs/LC_MESSAGES/django.mo rename to vips_messages/locale/bs/LC_MESSAGES/django.mo diff --git a/messages/locale/bs/LC_MESSAGES/django.po b/vips_messages/locale/bs/LC_MESSAGES/django.po similarity index 100% rename from messages/locale/bs/LC_MESSAGES/django.po rename to vips_messages/locale/bs/LC_MESSAGES/django.po diff --git a/messages/locale/nb/LC_MESSAGES/django.mo b/vips_messages/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from messages/locale/nb/LC_MESSAGES/django.mo rename to vips_messages/locale/nb/LC_MESSAGES/django.mo diff --git a/messages/locale/nb/LC_MESSAGES/django.po b/vips_messages/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from messages/locale/nb/LC_MESSAGES/django.po rename to vips_messages/locale/nb/LC_MESSAGES/django.po diff --git a/messages/models.py b/vips_messages/models.py similarity index 100% rename from messages/models.py rename to vips_messages/models.py diff --git a/messages/templates/messages/detail.html b/vips_messages/templates/messages/detail.html similarity index 100% rename from messages/templates/messages/detail.html rename to vips_messages/templates/messages/detail.html diff --git a/messages/templates/messages/index.html b/vips_messages/templates/messages/index.html similarity index 98% rename from messages/templates/messages/index.html rename to vips_messages/templates/messages/index.html index 77a5881a..b14f4d7c 100644 --- a/messages/templates/messages/index.html +++ b/vips_messages/templates/messages/index.html @@ -52,7 +52,7 @@ leadParagraph: "{{ message.lead_paragraph | escapejs }}", body: "{{ message.body | escapejs }}", createdBy:"{{ message.created_by }}", - url:"{% url 'messages:detail' message.message_id %}" + url:"{% url 'vips_messages:detail' message.message_id %}" } {% if not forloop.last %},{% endif %} {% endfor %} ]; diff --git a/messages/tests.py b/vips_messages/tests.py similarity index 100% rename from messages/tests.py rename to vips_messages/tests.py diff --git a/messages/urls.py b/vips_messages/urls.py similarity index 96% rename from messages/urls.py rename to vips_messages/urls.py index 47dacdc6..3cdbcb9a 100644 --- a/messages/urls.py +++ b/vips_messages/urls.py @@ -18,7 +18,7 @@ from django.conf.urls import patterns, url -from messages import views +from vips_messages import views urlpatterns = patterns('', # ex: /messages/ diff --git a/messages/views.py b/vips_messages/views.py similarity index 94% rename from messages/views.py rename to vips_messages/views.py index 3e708593..64b2e228 100644 --- a/messages/views.py +++ b/vips_messages/views.py @@ -19,8 +19,8 @@ from django.shortcuts import render from django.utils import translation -from messages.models import Message -from messages.forms import MessagePublishedDateFilterForm +from vips_messages.models import Message +from vips_messages.forms import MessagePublishedDateFilterForm def index(request): messages = None -- GitLab