# HG changeset patch # User verrierj # Date 1325518820 -3600 # Node ID c68744402249eb01cbd6574c8c1bba7245d59b87 # Parent c45aed3c7a89a78e271e349040bbc1cf0d73484b Change urls used in reverse to be compatible with the new organization diff -r c45aed3c7a89 -r c68744402249 src/ldt/ldt/ldt_utils/views/content.py --- a/src/ldt/ldt/ldt_utils/views/content.py Mon Jan 02 16:27:01 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/content.py Mon Jan 02 16:40:20 2012 +0100 @@ -264,9 +264,9 @@ member_list, admin_list = get_userlist_model(Content.objects.get(iri_id=iri_id), request.user) if iri_id: - create_content_action = reverse('ldt.ldt_utils.views.write_content', kwargs={'iri_id':iri_id}) + create_content_action = reverse('ldt.ldt_utils.views.content.write_content', kwargs={'iri_id':iri_id}) else: - create_content_action = reverse('ldt.ldt_utils.views.write_content') + create_content_action = reverse('ldt.ldt_utils.views.content.write_content') session_key = request.COOKIES[settings.SESSION_COOKIE_NAME] cookie_name = settings.SESSION_COOKIE_NAME diff -r c45aed3c7a89 -r c68744402249 src/ldt/ldt/ldt_utils/views/lignesdetemps.py --- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Mon Jan 02 16:27:01 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Mon Jan 02 16:40:20 2012 +0100 @@ -16,14 +16,14 @@ language_code = request.LANGUAGE_CODE[:2] - url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.search_init", args=[field, query]) + url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, query]) return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request)) def search_init(request, field, query): ldtgen = LdtUtils() - doc = ldtgen.generate_init([field, query], 'ldt.ldt_utils.views.search_ldt', 'ldt.ldt_utils.views.search_segments') + doc = ldtgen.generate_init([field, query], 'ldt.ldt_utils.views.lignesdetemps.search_ldt', 'ldt.ldt_utils.views.lignesdetemps.search_segments') resp = HttpResponse(mimetype="text/xml;charset=utf-8") resp.write(lxml.etree.tostring(doc, pretty_print=True, encoding="utf-8")) @@ -198,14 +198,14 @@ @login_required def index_project(request, id, full=False): - urlStr = settings.WEB_URL + reverse("space_ldt_init", args=['ldt_project', id]) - posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.save_ldt_project") + urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt_project', id]) + posturl = settings.WEB_URL + reverse("ldt.ldt_utils.lignesdetemps.views.save_ldt_project") language_code = request.LANGUAGE_CODE[:2] try: ldt = Project.safe_objects.get(ldt_id=id) except Project.DoesNotExist: - return HttpResponseRedirect(reverse("ldt.ldt_utils.views.workspace")) + return HttpResponseRedirect(reverse("ldt.ldt_utils.views.workspace.home")) if ldt.state == 2 or not request.user.has_perm('change_project', ldt): #published readonly = 'true' @@ -295,7 +295,7 @@ def index(request, url): - urlStr = settings.WEB_URL + reverse("ldt_init", args=['ldt', url]) + urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt', url]) language_code = request.LANGUAGE_CODE[:2] return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': urlStr, 'weburl':settings.WEB_URL + settings.BASE_URL}, context_instance=RequestContext(request)) diff -r c45aed3c7a89 -r c68744402249 src/ldt/ldt/ldt_utils/views/project.py --- a/src/ldt/ldt/ldt_utils/views/project.py Mon Jan 02 16:27:01 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/project.py Mon Jan 02 16:40:20 2012 +0100 @@ -46,7 +46,7 @@ form = AddProjectForm() return render_to_response('ldt/ldt_utils/create_ldt.html', {'form':form, 'form_status': form_status, 'contents':contents,'groups' : groups, - 'redirect_to': redirect_to, 'elem_list': get_userlist(request.user), 'create_project_action':reverse("ldt.ldt_utils.views.create_project", args=[iri_id])}, context_instance=RequestContext(request)) + 'redirect_to': redirect_to, 'elem_list': get_userlist(request.user), 'create_project_action':reverse("ldt.ldt_utils.views.project.create_project", args=[iri_id])}, context_instance=RequestContext(request)) @login_required def update_project(request, ldt_id): @@ -97,7 +97,7 @@ return render_to_response('ldt/ldt_utils/create_ldt.html', {'form':form, 'form_status':form_status, 'groups': groups, 'elem_list': get_userlist(request.user), 'ldt_id': ldt_id, 'contents':contents, 'member_list': member_list, 'admin_list': admin_list, - 'create_project_action':reverse("ldt.ldt_utils.views.update_project", args=[ldt_id])}, context_instance=RequestContext(request)) + 'create_project_action':reverse("ldt.ldt_utils.views.project.update_project", args=[ldt_id])}, context_instance=RequestContext(request)) @login_required def copy_project(request, ldt_id, group_id=0): diff -r c45aed3c7a89 -r c68744402249 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Mon Jan 02 16:27:01 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Mon Jan 02 16:40:20 2012 +0100 @@ -153,7 +153,7 @@ language_code = request.LANGUAGE_CODE[:2] if request.POST.has_key("ldt_pres"): - url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.search_init", args=[field, queryStr]) + url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, queryStr]) return render_to_response('ldt/ldt_utils/init_ldt_full.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request)) else: results = get_results_with_context(field, search) @@ -204,12 +204,12 @@ return render_to_response('ldt/ldt_utils/search_results.html', {'results': results, 'nb_results' : paginator.count, 'search' : search, 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/'}, context_instance=RequestContext(request)) else: - return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project')) + return HttpResponseRedirect(reverse('ldt.ldt_utils.views.workspace.published_project')) def search_listing(request): if not cache.get('complete_results_%s' % request.user.username): - return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project')) + return HttpResponseRedirect(reverse('ldt.ldt_utils.views.workspace.published_project')) complete_results = cache.get('complete_results_%s' % request.user.username) search = cache.get('search_%s' % request.user.username)