modification of get_web_url to have less dependances and be usable in ldt_utils->models
--- a/src/ldt/ldt/ldt_utils/models.py Tue Dec 04 13:11:19 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/models.py Tue Dec 04 13:33:23 2012 +0100
@@ -1,7 +1,6 @@
from django.conf import settings
from django.contrib.auth.models import User, Group
from django.db import models
-from django.contrib.sites.models import Site
from django.utils.translation import ugettext_lazy as _
from guardian.shortcuts import assign, remove_perm, get_perms
from ldt.core.models import Document
@@ -15,6 +14,7 @@
from utils import (create_ldt, copy_ldt, create_empty_iri, update_iri,
generate_uuid)
from ldt.utils import generate_hash
+from ldt.utils.web_url_management import get_web_url
import datetime
import lxml.etree #@UnresolvedImport
import mimetypes
@@ -304,7 +304,7 @@
def iri_url(self, web_url=None):
if not web_url:
- web_url='http://'+Site.objects.get_current().domain
+ web_url=get_web_url()
if url_utils.is_absolute(self.iriurl):
return self.iriurl
else:
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Tue Dec 04 13:11:19 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Tue Dec 04 13:33:23 2012 +0100
@@ -10,7 +10,8 @@
from ldt.security.utils import set_forbidden_stream
from ldt.ldt_utils.stat import update_stat_project
from ldt.ldt_utils.searchutils import search_generate_ldt
-from ldt.utils.url import absstatic, absurl, get_web_url
+from ldt.utils.url import absstatic, absurl
+from ldt.utils.web_url_management import get_web_url
import base64
import django.core.urlresolvers
import lxml.etree
--- a/src/ldt/ldt/ldt_utils/views/workspace.py Tue Dec 04 13:11:19 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py Tue Dec 04 13:33:23 2012 +0100
@@ -11,7 +11,8 @@
from django.utils.html import escape
from django.utils.translation import ugettext as _
from ldt.ldt_utils.forms import SearchForm
-from ldt.utils.url import absstatic, absurl, get_web_url
+from ldt.utils.url import absstatic, absurl
+from ldt.utils.web_url_management import get_web_url
from ldt.ldt_utils.models import Content, Project, Segment
from ldt.ldt_utils.utils import boolean_convert
from ldt.ldt_utils.projectserializer import ProjectJsonSerializer
--- a/src/ldt/ldt/utils/context_processors.py Tue Dec 04 13:11:19 2012 +0100
+++ b/src/ldt/ldt/utils/context_processors.py Tue Dec 04 13:33:23 2012 +0100
@@ -1,5 +1,5 @@
from ldt import settings
-from ldt.utils.url import get_web_url
+from ldt.utils.web_url_management import get_web_url
import ldt
--- a/src/ldt/ldt/utils/url.py Tue Dec 04 13:11:19 2012 +0100
+++ b/src/ldt/ldt/utils/url.py Tue Dec 04 13:33:23 2012 +0100
@@ -1,21 +1,12 @@
from django.contrib.staticfiles.storage import staticfiles_storage
from django.contrib.sites.models import Site
from django.core.urlresolvers import reverse
+from ldt.utils.web_url_management import get_web_url
from ldt import settings
import httplib2
import re
import urlparse
-def get_web_url(request=None):
- if request:
- if request.is_secure():
- domain = "https://%s" % Site.objects.get_current().domain
- else:
- domain = "http://%s" % Site.objects.get_current().domain
- else :
- domain = "http://%s" % Site.objects.get_current().domain
- return domain
-
def absstatic(request, path):
domain=get_web_url(request)
new_path = staticfiles_storage.url(path)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/utils/web_url_management.py Tue Dec 04 13:33:23 2012 +0100
@@ -0,0 +1,11 @@
+from django.contrib.sites.models import Site
+
+def get_web_url(request=None):
+ if request:
+ if request.is_secure():
+ domain = "https://%s" % Site.objects.get_current().domain
+ else:
+ domain = "http://%s" % Site.objects.get_current().domain
+ else :
+ domain = "http://%s" % Site.objects.get_current().domain
+ return domain