Skip to content
Snippets Groups Projects
Commit 2941aa8f authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Upgrade to Django 1.8

parent 5bf97235
No related branches found
No related tags found
No related merge requests found
Showing
with 13 additions and 8 deletions
eclipse.preferences.version=1
encoding//VIPSWeb/local_settings.py=UTF-8
encoding//common/util.py=utf-8
encoding//forecasts/models.py=utf-8
......@@ -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',
......
......@@ -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>
......
......@@ -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")),
......
......@@ -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):
......
......@@ -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
......
default_app_config = 'vips_messages.apps.VIPSMessagesConfig'
\ No newline at end of file
File moved
from django.apps import AppConfig
class VIPSMessagesConfig(AppConfig):
name = 'vips_messages'
verbose_name = "VIPS messages"
\ No newline at end of file
File moved
File moved
......@@ -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 %}
];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment