Fixed reverse urls in tests, removed a commented out block from a template, fixed a typo in a directory setting

 - Legacy-Id: 4599

Author: rjsparks

ietf/idrfc/testsREDESIGN.py

@@ -411,7 +411,7 @@ class EditPositionTestCase(django.test.TestCase):
 
     def test_edit_position(self):
         draft = make_test_data()
-        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name,
+        url = urlreverse('ietf.idrfc.views_ballot.edit_position', kwargs=dict(name=draft.name,
                                                           ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
         login_testing_unauthorized(self, "ad", url)
 
@@ -473,7 +473,7 @@ def test_edit_position(self):
 
     def test_edit_position_as_secretary(self):
         draft = make_test_data()
-        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name,
+        url = urlreverse('ietf.idrfc.views_ballot.edit_position', kwargs=dict(name=draft.name,
                                                           ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
         ad = Person.objects.get(name="Aread Irector")
         url += "?ad=%s" % ad.pk
@@ -498,7 +498,7 @@ def test_edit_position_as_secretary(self):
 
     def test_cannot_edit_position_as_pre_ad(self):
         draft = make_test_data()
-        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name,
+        url = urlreverse('ietf.idrfc.views_ballot.edit_position', kwargs=dict(name=draft.name,
                           ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
 
         # transform to pre-ad

ietf/settings.py

@@ -195,7 +195,7 @@
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
 CHARTER_PATH = '/a/www/ietf-ftp/charters/'
 CHARTER_TXT_URL = 'http://www.ietf.org/charter/'
-CONFLICT_REVIEW_PATH = '/a/wwww/ietf-ftp/conflict_reviews'
+CONFLICT_REVIEW_PATH = '/a/www/ietf-ftp/conflict_reviews'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s'
 MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'

ietf/templates/idrfc/doc_tab_document.html

@@ -61,11 +61,7 @@
 <span id="doc_conflict_review_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}<span class="first-child"><a href="{{start_review_url}}">Begin IETF Conflict Review</a></span>{% endif %}</span>
 {% endif %}
 {% else %}
- {% if stream_info.stream.name == 'IETF'%}{%if doc.in_ietf_process %}
-  {% comment %}
-   <span id="doc_edit_info_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_info name=doc.draft_name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Edit</a></span>{% endif %}</span>
-  {% endcomment %}
- {% else %}
+ {% if stream_info.stream.name == 'IETF'%}{%if not doc.in_ietf_process %}
    <span id="doc_add_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_info name=doc.draft_name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Begin IESG Processing</a></span>{% endif %}</span>
   {% endif %}{% endif %}
 {% endif %}