From 4ca091dba37b644ddd30428a88157b2637f76afb Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Thu, 21 Feb 2013 19:03:04 +0000 Subject: [PATCH] changing name of ipr app to ipradmin - Legacy-Id: 5440 --- ietf/secr/ipradmin/forms.py | 2 +- ietf/secr/ipradmin/tests.py | 2 +- ietf/secr/ipradmin/urls.py | 24 ++++++++++++------------ ietf/secr/ipradmin/views.py | 24 ++++++++++++------------ ietf/secr/templates/ipradmin/create.html | 6 +++--- ietf/secr/templates/ipradmin/detail.html | 2 +- ietf/secr/templates/ipradmin/list.html | 14 +++++++------- ietf/secr/templates/ipradmin/notify.html | 2 +- ietf/secr/templates/ipradmin/update.html | 6 +++--- ietf/secr/urls.py | 2 +- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ietf/secr/ipradmin/forms.py b/ietf/secr/ipradmin/forms.py index e44270341..02307e6c1 100644 --- a/ietf/secr/ipradmin/forms.py +++ b/ietf/secr/ipradmin/forms.py @@ -5,7 +5,7 @@ from django.utils.safestring import mark_safe from django.forms.formsets import formset_factory from django.utils import simplejson -from ietf.ipr.models import IprDetail, IprContact, LICENSE_CHOICES, IprRfc, IprDraft, IprUpdate, SELECT_CHOICES, IprDocAlias +from ietf.ipradmin.models import IprDetail, IprContact, LICENSE_CHOICES, IprRfc, IprDraft, IprUpdate, SELECT_CHOICES, IprDocAlias from ietf.doc.models import DocAlias from ietf.secr.utils.document import get_rfc_num diff --git a/ietf/secr/ipradmin/tests.py b/ietf/secr/ipradmin/tests.py index 73a4d3d1d..212601260 100644 --- a/ietf/secr/ipradmin/tests.py +++ b/ietf/secr/ipradmin/tests.py @@ -14,7 +14,7 @@ class MainTestCase(TestCase): def test_main(self): "Main Test" draft = make_test_data() - url = reverse('ipr') + url = reverse('ipradmin') response = self.client.get(url,REMOTE_USER=SEC_USER) self.assertEquals(response.status_code, 200) """ diff --git a/ietf/secr/ipradmin/urls.py b/ietf/secr/ipradmin/urls.py index 4dab37ed0..9f37ba666 100644 --- a/ietf/secr/ipradmin/urls.py +++ b/ietf/secr/ipradmin/urls.py @@ -1,18 +1,18 @@ from django.conf.urls.defaults import * from django.views.generic.simple import redirect_to -urlpatterns = patterns('ietf.secr.ipr.views', - url(r'^$', redirect_to, {'url': 'admin/'}, name="ipr"), - url(r'^admin/?$', 'admin_list', name="ipr_admin_list"), - url(r'^admin/detail/(?P\d+)/?$', 'admin_detail', name="ipr_admin_detail"), - url(r'^admin/create/?$', 'admin_create', name="ipr_admin_create"), - url(r'^admin/update/(?P\d+)/?$', 'admin_update', name="ipr_admin_update"), - url(r'^admin/notify/(?P\d+)/?$', 'admin_notify', name="ipr_admin_notify"), - url(r'^admin/old_submitter_notify/(?P\d+)/?$', 'old_submitter_notify', name="ipr_old_submitter_notify"), - url(r'^admin/post/(?P\d+)/?$', 'admin_post', name="ipr_admin_post"), - url(r'^admin/delete/(?P\d+)/?$', 'admin_delete', name="ipr_admin_delete"), - url(r'^ajax/rfc_num/?$', 'ajax_rfc_num', name="ipr_ajax_rfc_num"), - url(r'^ajax/internet_draft/?$', 'ajax_internet_draft', name="ipr_ajax_internet_draft"), +urlpatterns = patterns('ietf.secr.ipradmin.views', + url(r'^$', redirect_to, {'url': 'admin/'}, name="ipradmin"), + url(r'^admin/?$', 'admin_list', name="ipradmin_admin_list"), + url(r'^admin/detail/(?P\d+)/?$', 'admin_detail', name="ipradmin_admin_detail"), + url(r'^admin/create/?$', 'admin_create', name="ipradmin_admin_create"), + url(r'^admin/update/(?P\d+)/?$', 'admin_update', name="ipradmin_admin_update"), + url(r'^admin/notify/(?P\d+)/?$', 'admin_notify', name="ipradmin_admin_notify"), + url(r'^admin/old_submitter_notify/(?P\d+)/?$', 'old_submitter_notify', name="ipradmin_old_submitter_notify"), + url(r'^admin/post/(?P\d+)/?$', 'admin_post', name="ipradmin_admin_post"), + url(r'^admin/delete/(?P\d+)/?$', 'admin_delete', name="ipradmin_admin_delete"), + url(r'^ajax/rfc_num/?$', 'ajax_rfc_num', name="ipradmin_ajax_rfc_num"), + url(r'^ajax/internet_draft/?$', 'ajax_internet_draft', name="ipradmin_ajax_internet_draft"), ) diff --git a/ietf/secr/ipradmin/views.py b/ietf/secr/ipradmin/views.py index d4f70ea67..77dba489e 100644 --- a/ietf/secr/ipradmin/views.py +++ b/ietf/secr/ipradmin/views.py @@ -10,18 +10,18 @@ from django.core.urlresolvers import reverse from django.utils.safestring import mark_safe from ietf.secr.lib import template, jsonapi -from ietf.secr.ipr.managers import IprDetailManager -from ietf.secr.ipr.forms import IprDetailForm, IPRContactFormset +from ietf.secr.ipradmin.managers import IprDetailManager +from ietf.secr.ipradmin.forms import IprDetailForm, IPRContactFormset from ietf.secr.utils.document import get_rfc_num, is_draft import ietf.settings as settings -from ietf.ipr.models import IprDetail, IprUpdate, IprRfc, IprDraft, IprContact, LICENSE_CHOICES, STDONLY_CHOICES, IprNotification +from ietf.ipradmin.models import IprDetail, IprUpdate, IprRfc, IprDraft, IprContact, LICENSE_CHOICES, STDONLY_CHOICES, IprNotification from ietf.utils.mail import send_mail_text from ietf.doc.models import DocAlias from ietf.group.models import Role -@template('ipr/list.html') +@template('ipradmin/list.html') def admin_list(request): queue_ipr = IprDetailManager.queue_ipr() generic_ipr = IprDetailManager.generic_ipr() @@ -67,7 +67,7 @@ def admin_post(request, ipr_id, from_page, command): ipr_dtl.save() #assert False, (ipr_dtl.ipr_id, ipr_dtl.is_pending) - redirect_url = '/ipr/admin/notify/%s?from=%s' % (ipr_id, from_page) + redirect_url = '/ipradmin/admin/notify/%s?from=%s' % (ipr_id, from_page) return HttpResponseRedirect(redirect_url) # end admin_post @@ -111,7 +111,7 @@ def send_notifications(post_data, ipr_id, update=False): return None -@template('ipr/notify.html') +@template('ipradmin/notify.html') def admin_notify(request, ipr_id): if request.POST and 'command' in request.POST and 'do_send_notifications' == request.POST['command']: send_result = send_notifications(request.POST, ipr_id) @@ -346,14 +346,14 @@ def get_wg_email_list(group): return ', '.join(result) -@template('ipr/delete.html') +@template('ipradmin/delete.html') def admin_delete(request, ipr_id): ipr_dtl = IprDetail.objects.get(ipr_id=ipr_id) ipr_dtl.status = 2 ipr_dtl.save() return HttpResponseRedirect(reverse('ipr_admin_list')) -@template('ipr/notify.html') +@template('ipradmin/notify.html') def old_submitter_notify(request, ipr_id): if request.POST and 'command' in request.POST \ and 'do_send_update_notification' == request.POST['command']: @@ -418,7 +418,7 @@ def old_submitter_notify(request, ipr_id): ) # end old_submitter_notify -@template('ipr/detail.html') +@template('ipradmin/detail.html') def admin_detail(request, ipr_id): if request.POST and request.POST['command']: command = request.POST['command'] @@ -678,7 +678,7 @@ def admin_detail(request, ipr_id): ) # end admin_detail -@template('ipr/create.html') +@template('ipradmin/create.html') def admin_create(request): if request.method == 'POST': ipr_detail_form = IprDetailForm(request.POST, request.FILES, formtype='create') @@ -703,7 +703,7 @@ def admin_create(request): ipr_contact_formset = ipr_contact_formset) # end admin_create -@template('ipr/update.html') +@template('ipradmin/update.html') def admin_update(request, ipr_id): if request.method == 'POST': ipr_detail_form = IprDetailForm( @@ -720,7 +720,7 @@ def admin_update(request, ipr_id): ipr_detail = ipr_detail_form.save(commit=False) if 'update_ipr' in request.POST: if ipr_detail.third_party: - return HttpResponseRedirect('/ipr/admin/notify/%s?from=update' % ipr_id) + return HttpResponseRedirect('/ipradmin/admin/notify/%s?from=update' % ipr_id) else: redirect_url = '' else: # remove diff --git a/ietf/secr/templates/ipradmin/create.html b/ietf/secr/templates/ipradmin/create.html index 788ed3484..af2bd796e 100644 --- a/ietf/secr/templates/ipradmin/create.html +++ b/ietf/secr/templates/ipradmin/create.html @@ -55,15 +55,15 @@ $(function() { }); } - setup_ajax($("#id_rfc_num"), $("#rfc_num_list"), $("#id_rfc_num_search"), "{% url ipr_ajax_rfc_num %}"); - setup_ajax($("#id_id_filename"), $("#id_filename_list"), $("#id_id_filename_search"), "{% url ipr_ajax_internet_draft %}"); + setup_ajax($("#id_rfc_num"), $("#rfc_num_list"), $("#id_rfc_num_search"), "{% url ipradmin_ajax_rfc_num %}"); + setup_ajax($("#id_id_filename"), $("#id_filename_list"), $("#id_id_filename_search"), "{% url ipradmin_ajax_internet_draft %}"); }); {% endblock %} {% block breadcrumbs %}{{ block.super }} - » IPR Admin + » IPR Admin » Create {% endblock %} diff --git a/ietf/secr/templates/ipradmin/detail.html b/ietf/secr/templates/ipradmin/detail.html index c5a713a0e..661a0bfb1 100644 --- a/ietf/secr/templates/ipradmin/detail.html +++ b/ietf/secr/templates/ipradmin/detail.html @@ -9,7 +9,7 @@ IPR Admin Detail Page {% endblock %} {% block breadcrumbs %}{{ block.super }} - » IPR Admin + » IPR Admin » Detail {% endblock %} diff --git a/ietf/secr/templates/ipradmin/list.html b/ietf/secr/templates/ipradmin/list.html index 8918f2b39..1094dd420 100644 --- a/ietf/secr/templates/ipradmin/list.html +++ b/ietf/secr/templates/ipradmin/list.html @@ -17,7 +17,7 @@ IPR Administrate Page
    -
    • +
@@ -26,7 +26,7 @@ IPR Administrate Page {% for ipr in queue_ipr %} - + {% endfor %}
{{ipr.title }}{{ipr.title }}
@@ -36,7 +36,7 @@ IPR Administrate Page {% for ipr in generic_ipr %} -
{{ipr.title }} + {{ipr.title }} {% if ipr.legacy_title_1 %}
          {{ipr.legacy_title_1}}, @@ -55,7 +55,7 @@ IPR Administrate Page {% for ipr in third_party_notifications %} -
{{ipr.title }} + {{ipr.title }} {% if ipr.legacy_title_1 %}
          {{ipr.legacy_title_1}}, @@ -74,7 +74,7 @@ IPR Administrate Page {% for ipr in specific_ipr %} -
{{ipr.title }} + {{ipr.title }} {% if ipr.legacy_title_1 %}
          {{ipr.legacy_title_1}}, @@ -93,7 +93,7 @@ IPR Administrate Page {% for ipr in admin_removed_ipr %} -
{{ipr.title }} + {{ipr.title }} {% if ipr.legacy_title_1 %}
          {{ipr.legacy_title_1}}, @@ -111,7 +111,7 @@ IPR Administrate Page {% for ipr in request_removed_ipr %} -
{{ipr.title }} + {{ipr.title }} {% if ipr.legacy_title_1 %}
          {{ipr.legacy_title_1}}, diff --git a/ietf/secr/templates/ipradmin/notify.html b/ietf/secr/templates/ipradmin/notify.html index 2aaaaf934..025c21e79 100644 --- a/ietf/secr/templates/ipradmin/notify.html +++ b/ietf/secr/templates/ipradmin/notify.html @@ -9,7 +9,7 @@ IPR Admin Notify Page {% endblock %} {% block breadcrumbs %}{{ block.super }} - » IPR Admin + » IPR Admin » Notify {% endblock %} diff --git a/ietf/secr/templates/ipradmin/update.html b/ietf/secr/templates/ipradmin/update.html index cd210290c..2f215bc3b 100644 --- a/ietf/secr/templates/ipradmin/update.html +++ b/ietf/secr/templates/ipradmin/update.html @@ -54,15 +54,15 @@ $(function() { }); } - setup_ajax($("#id_rfc_num"), $("#rfc_num_list"), $("#id_rfc_num_search"), "{% url ipr_ajax_rfc_num %}"); - setup_ajax($("#id_id_filename"), $("#id_filename_list"), $("#id_id_filename_search"), "{% url ipr_ajax_internet_draft %}"); + setup_ajax($("#id_rfc_num"), $("#rfc_num_list"), $("#id_rfc_num_search"), "{% url ipradmin_ajax_rfc_num %}"); + setup_ajax($("#id_id_filename"), $("#id_filename_list"), $("#id_id_filename_search"), "{% url ipradmin_ajax_internet_draft %}"); }); {% endblock %} {% block breadcrumbs %}{{ block.super }} - » IPR Admin + » IPR Admin » Update {% endblock %} diff --git a/ietf/secr/urls.py b/ietf/secr/urls.py index 96f4437bb..321861e01 100644 --- a/ietf/secr/urls.py +++ b/ietf/secr/urls.py @@ -10,7 +10,7 @@ urlpatterns = patterns('', (r'^console/', include('ietf.secr.console.urls')), (r'^drafts/', include('ietf.secr.drafts.urls')), (r'^groups/', include('ietf.secr.groups.urls')), - (r'^ipr/', include('ietf.secr.ipr.urls')), + (r'^ipradmin/', include('ietf.secr.ipradmin.urls')), (r'^meetings/', include('ietf.secr.meetings.urls')), (r'^proceedings/', include('ietf.secr.proceedings.urls')), (r'^roles/', include('ietf.secr.roles.urls')),