Skip to content

Commit d2b9adf

Browse files
committed
Move ietf_filters templatetag from idtracker/ to doc/
- Legacy-Id: 6053
1 parent 6ac0920 commit d2b9adf

7 files changed

Lines changed: 13 additions & 16 deletions

File tree

ietf/doc/feeds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from ietf.doc.models import *
1414
from ietf.doc.utils import augment_events_with_revision
15-
from ietf.idtracker.templatetags.ietf_filters import format_textarea
15+
from ietf.doc.templatetags.ietf_filters import format_textarea
1616

1717
class DocumentChanges(Feed):
1818
feed_type = Atom1Feed
File renamed without changes.

ietf/doc/tests.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,3 +285,10 @@ def test_add_comment(self):
285285
q = PyQuery(r.content)
286286
self.assertEquals(len(q('form textarea[name=comment]')), 1)
287287

288+
289+
class TemplateTagTest(unittest.TestCase):
290+
def test_template_tags(self):
291+
import doctest
292+
from ietf.doc.templatetags import ietf_filters
293+
failures, tests = doctest.testmod(ietf_filters)
294+
self.assertEqual(failures, 0)

ietf/idindex/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from django.conf import settings
99
from django.template.loader import render_to_string
1010

11-
from ietf.idtracker.templatetags.ietf_filters import clean_whitespace
11+
from ietf.doc.templatetags.ietf_filters import clean_whitespace
1212
from ietf.doc.models import *
1313

1414
def all_id_txt():

ietf/idtracker/tests.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

ietf/iesg/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
from ietf.idrfc.idrfc_wrapper import IdWrapper, RfcWrapper
5252
from ietf.doc.utils import update_telechat
5353
from ietf.ietfauth.decorators import group_required, role_required
54-
from ietf.idtracker.templatetags.ietf_filters import in_group
55-
from ietf.ipr.models import IprDocAlias
54+
from ietf.ietfauth.utils import has_role
55+
from ietf.ipr.models import IprDocAlias
5656
from ietf.doc.models import Document, TelechatDocEvent, LastCallDocEvent, ConsensusDocEvent
5757
from ietf.group.models import Group, GroupMilestone
5858

@@ -712,7 +712,7 @@ def get_possible_wg_actions():
712712
def working_group_actions(request):
713713
current_items = WGAction.objects.order_by('status_date').select_related()
714714

715-
if request.method == 'POST' and in_group(request.user, 'Secretariat'):
715+
if request.method == 'POST' and has_role(request.user, 'Secretariat'):
716716
filename = request.POST.get('filename')
717717
if filename and filename in os.listdir(settings.IESG_WG_EVALUATION_DIR):
718718
if 'delete' in request.POST:

ietf/nomcom/templatetags/nomcom_tags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from ietf.utils.pipe import pipe
99
from ietf.ietfauth.decorators import has_role
10-
from ietf.idtracker.templatetags.ietf_filters import wrap_text
10+
from ietf.doc.templatetags.ietf_filters import wrap_text
1111

1212
from ietf.person.models import Person
1313
from ietf.nomcom.models import Feedback

0 commit comments

Comments
 (0)