altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

changing name of ipr app to ipradmin

Browse source 
- Legacy-Id: 5440
This commit is contained in:
Ryan Cross 2013-02-21 19:03:04 +00:00
parent 185ac9f547
commit 4ca091dba3
10 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/secr/ipradmin/forms.py
View file

@ -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

2
ietf/secr/ipradmin/tests.py
View file

@ -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)
"""

24
ietf/secr/ipradmin/urls.py
View file

@ -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<ipr_id>\d+)/?$', 'admin_detail', name="ipr_admin_detail"),
url(r'^admin/create/?$', 'admin_create', name="ipr_admin_create"),
url(r'^admin/update/(?P<ipr_id>\d+)/?$', 'admin_update', name="ipr_admin_update"),
url(r'^admin/notify/(?P<ipr_id>\d+)/?$', 'admin_notify', name="ipr_admin_notify"),
url(r'^admin/old_submitter_notify/(?P<ipr_id>\d+)/?$', 'old_submitter_notify', name="ipr_old_submitter_notify"),
url(r'^admin/post/(?P<ipr_id>\d+)/?$', 'admin_post', name="ipr_admin_post"),
url(r'^admin/delete/(?P<ipr_id>\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<ipr_id>\d+)/?$', 'admin_detail', name="ipradmin_admin_detail"),
url(r'^admin/create/?$', 'admin_create', name="ipradmin_admin_create"),
url(r'^admin/update/(?P<ipr_id>\d+)/?$', 'admin_update', name="ipradmin_admin_update"),
url(r'^admin/notify/(?P<ipr_id>\d+)/?$', 'admin_notify', name="ipradmin_admin_notify"),
url(r'^admin/old_submitter_notify/(?P<ipr_id>\d+)/?$', 'old_submitter_notify', name="ipradmin_old_submitter_notify"),
url(r'^admin/post/(?P<ipr_id>\d+)/?$', 'admin_post', name="ipradmin_admin_post"),
url(r'^admin/delete/(?P<ipr_id>\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"),
)

24
ietf/secr/ipradmin/views.py
View file

@ -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

6
ietf/secr/templates/ipradmin/create.html
View file

@ -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 %}");
});
</script>
{% endblock %}
{% block breadcrumbs %}{{ block.super }}
&raquo; <a href="{% url ipr_admin_list %}">IPR Admin</a>
&raquo; <a href="{% url ipradmin_admin_list %}">IPR Admin</a>
&raquo; Create
{% endblock %}

2
ietf/secr/templates/ipradmin/detail.html
View file

@ -9,7 +9,7 @@ IPR Admin Detail Page
{% endblock %}
{% block breadcrumbs %}{{ block.super }}
&raquo; <a href="{% url ipr_admin_list %}">IPR Admin</a>
&raquo; <a href="{% url ipradmin_admin_list %}">IPR Admin</a>
&raquo; Detail
{% endblock %}

14
ietf/secr/templates/ipradmin/list.html
View file

@ -17,7 +17,7 @@ IPR Administrate Page
<div class="module">
<div class="button-group">
<ul>
<li><button onclick="window.location='{% url ipr_admin_create %}'">Create new IPR</button></li>
<li><button onclick="window.location='{% url ipradmin_admin_create %}'">Create new IPR</button></li>
<li><button onclick="window.location='https://datatracker.ietf.org/public/ipr_disclosure.cgi'">IPR Disclosure Page</button></li>
</ul>
</div>
@ -26,7 +26,7 @@ IPR Administrate Page
<table>
{% for ipr in queue_ipr %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url ipr_admin_detail ipr.ipr_id %}">{{ipr.title }}</a></td>
<td><a href="{% url ipradmin_admin_detail ipr.ipr_id %}">{{ipr.title }}</a></td>
</tr>
{% endfor %}
</table>
@ -36,7 +36,7 @@ IPR Administrate Page
<table>
{% for ipr in generic_ipr %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url ipr_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
<td><a href="{% url ipradmin_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
{% if ipr.legacy_title_1 %}
<br />&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<a href="{{ipr.legacy_url_1}}">{{ipr.legacy_title_1}},</a>
@ -55,7 +55,7 @@ IPR Administrate Page
<table>
{% for ipr in third_party_notifications %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url ipr_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
<td><a href="{% url ipradmin_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
{% if ipr.legacy_title_1 %}
<br />&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<a href="{{ipr.legacy_url_1}}">{{ipr.legacy_title_1}},</a>
@ -74,7 +74,7 @@ IPR Administrate Page
<table>
{% for ipr in specific_ipr %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url ipr_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
<td><a href="{% url ipradmin_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
{% if ipr.legacy_title_1 %}
<br />&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<a href="{{ipr.legacy_url_1}}">{{ipr.legacy_title_1}},</a>
@ -93,7 +93,7 @@ IPR Administrate Page
<table>
{% for ipr in admin_removed_ipr %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url ipr_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
<td><a href="{% url ipradmin_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
{% if ipr.legacy_title_1 %}
<br />&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<a href="{{ipr.legacy_url_1}}">{{ipr.legacy_title_1}},</a>
@ -111,7 +111,7 @@ IPR Administrate Page
<table>
{% for ipr in request_removed_ipr %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url ipr_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
<td><a href="{% url ipradmin_admin_update ipr.ipr_id %}">{{ipr.title }}</a>
{% if ipr.legacy_title_1 %}
<br />&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<a href="{{ipr.legacy_url_1}}">{{ipr.legacy_title_1}},</a>

2
ietf/secr/templates/ipradmin/notify.html
View file

@ -9,7 +9,7 @@ IPR Admin Notify Page
{% endblock %}
{% block breadcrumbs %}{{ block.super }}
&raquo; <a href="{% url ipr_admin_list %}">IPR Admin</a>
&raquo; <a href="{% url ipradmin_admin_list %}">IPR Admin</a>
&raquo; Notify
{% endblock %}

6
ietf/secr/templates/ipradmin/update.html
View file

@ -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 %}");
});
</script>
{% endblock %}
{% block breadcrumbs %}{{ block.super }}
&raquo; <a href="{% url ipr_admin_list %}">IPR Admin</a>
&raquo; <a href="{% url ipradmin_admin_list %}">IPR Admin</a>
&raquo; Update
{% endblock %}

2
ietf/secr/urls.py
View file

@ -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')),