Merge lp:~sinzui/launchpad/edit-question-bug-210312 into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to fix some simple issues with Launchpad Answers.

    lp:~sinzui/launchpad/edit-question-bug-210312
    Diff size: 334
    Launchpad bug: https://bugs.launchpad.net/bugs/210312
                   https://bugs.launchpad.net/bugs/275475
                   https://bugs.launchpad.net/bugs/386158
    Test command: ./bin/test -vv \
        -t answers.*views.txt
        -t question-subscriptions
        -t this-is-a-faq
    Pre-implementation: no one
    Target release: 3.1.12

= Fix some simple issues with Launchpad Answers =

Bug 210312 [cannot edit the language of the question]
    The question +edit page only shows the user's preferred languages. It
    must show all languages so that the user can fix the language.

Bug 275475 [launchpad displays the hint for subscribing when i click on
    unsubscribe]
    The paragraph talks about subscribing, but the action is unsubscribing.

Bug 386158 [confusingly redundant fields in create faq page]
    There are two textareas, each of which seems to want the answer to the faq.

== Rules ==

Bug 210312 [cannot edit the language of the question]
    * Remove the QuestionSupportLanguageMixin and use the interface's
      language

Bug 275475 [launchpad displays the hint for subscribing when i click on
    unsubscribe]
    * Add a condition to the template to select the right paragraph to show.

Bug 386158 [confusingly redundant fields in create faq page]
    * Revise the field labels and hints to distinguish between the FAQ and
      the question the user is answering.

== QA ==

Bug 210312 [cannot edit the language of the question]
    * Edit a question on edge.
    * Verify the language choice contains every language registered in
      Launchpad.

Bug 275475 [launchpad displays the hint for subscribing when i click on
    unsubscribe]
    * Choose the subscribe link on a a question.
    * Verify the link to your subscriptions page actually goes to your
      subscription page.
    * Choose the Subscribe button
    * Choose the Unsubscribe link
    * Verify that the paragraph talks about the consequence of unsubscribing.

Bug 386158 [confusingly redundant fields in create faq page]
    * Choose create a new FAQ link from any question.
    * Verify the FAQ field speak of "this FAQ".
    * Verify the last field labeled "Additional comment for question #..."

== Lint ==

Linting changed files:
  lib/lp/answers/browser/question.py
  lib/lp/answers/browser/tests/views.txt
  lib/lp/answers/interfaces/faq.py
  lib/lp/answers/interfaces/question.py
  lib/lp/answers/stories/question-subscriptions.txt
  lib/lp/answers/stories/this-is-a-faq.txt
  lib/lp/answers/templates/question-subscription.pt

== Test ==

    * lib/lp/answers/browser/tests/views.txt
      * Modernised part of the test--they predated LaunchpadFormView
      * Added label and page_title tests to verify that sane fragments
        for subscribe/unsubscribe were created for the automated rules.
      * Verified that the QuestionEdit form uses the LanguageVocabulary.
    * lib/lp/answers/stories/question-subscriptions.txt
      * Removed some cruft from the story.
      * Revised the story to verify the links in the subscr...

[Aaron Bentley (abentley)]

Looks good.

review: Approve

=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py	2009-11-11 22:17:17 +0000
+++ lib/lp/answers/browser/question.py	2009-12-05 17:20:55 +0000
@@ -46,6 +46,7 @@
 
 from lazr.lifecycle.event import ObjectModifiedEvent
 from lazr.lifecycle.snapshot import Snapshot
+from lazr.restful.interface import copy_field
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
@@ -321,7 +322,7 @@
 
     @property
     def page_title(self):
-        return 'Subscription to question #%s' % self.context.id
+        return 'Subscription'
 
     @property
     def label(self):
@@ -452,8 +453,7 @@
                         "The language in which this question is written. "
                         "The languages marked with a star (*) are the "
                         "languages spoken by at least one answer contact in "
-                        "the community."
-                        )),
+                        "the community.")),
                 render_context=self.render_context)
 
     def shouldWarnAboutUnsupportedLanguage(self):
@@ -659,11 +659,12 @@
     cancel_url = next_url
 
 
-class QuestionEditView(QuestionSupportLanguageMixin, LaunchpadEditFormView):
+class QuestionEditView(LaunchpadEditFormView):
     """View for editing a Question."""
     schema = IQuestion
     label = 'Edit question'
-    field_names = ["title", "description", "target", "assignee", "whiteboard"]
+    field_names = [
+        "language", "title", "description", "target", "assignee", "whiteboard"]
 
     custom_widget('title', TextWidget, displayWidth=40)
     custom_widget('whiteboard', TextAreaWidget, height=5)
@@ -685,10 +686,6 @@
         self.form_fields = self.form_fields.omit("distribution",
             "sourcepackagename", "product")
 
-        # Add the language field with a vocabulary specialized for display
-        # purpose.
-        self.form_fields = self.createLanguageField() + self.form_fields
-
         editable_fields = []
         for field in self.form_fields:
             if zope.security.canWrite(self.context, field.__name__):
@@ -764,7 +761,6 @@
         return '%s suggests this article as an answer to your question:' % (
             self.user.displayname)
 
-
     def getFAQMessageReference(self, faq):
         """Return the reference for the FAQ to use in the linking message."""
         return smartquote('FAQ #%s: "%s".' % (faq.id, faq.title))
@@ -991,7 +987,7 @@
     def original_bug(self):
         """Return the bug that the question was created from or None."""
         for buglink in self.context.bug_links:
-            if (check_permission('launchpad.View',  buglink.bug)
+            if (check_permission('launchpad.View', buglink.bug)
                 and buglink.bug.owner == self.context.owner
                 and buglink.bug.datecreated == self.context.datecreated):
                 return buglink.bug
@@ -1140,7 +1136,10 @@
         Adds a message field to the form.
         """
         super(QuestionCreateFAQView, self).setUpFields()
-        self.form_fields += form.Fields(IQuestionLinkFAQForm['message'])
+        self.form_fields += form.Fields(
+            copy_field(IQuestionLinkFAQForm['message']))
+        self.form_fields['message'].field.title = _(
+            'Additional comment for question #%s' % self.context.id)
         self.form_fields['message'].custom_widget = (
             self.custom_widgets['message'])
 
 
=== modified file 'lib/lp/answers/browser/tests/views.txt'
--- lib/lp/answers/browser/tests/views.txt	2009-09-28 09:11:17 +0000
+++ lib/lp/answers/browser/tests/views.txt	2009-12-05 17:20:55 +0000
@@ -38,34 +38,46 @@
 This view is used to subscribe and unsubscribe from a question.
 Subscription is done when the user click on the 'Subscribe' button.
 
-    >>> request = LaunchpadTestRequest(form={'subscribe': 'Subscribe'})
-    >>> request.method = 'POST'
-    >>> view = getMultiAdapter((question_three, request), name='+subscribe')
-    >>> view.initialize()
+    >>> view = create_initialized_view(question_three, name='+subscribe')
+    >>> print view.label
+    Subscribe to question
+
+    >>> print view.page_title
+    Subscription
+
+    >>> form = {'subscribe': 'Subscribe'}
+    >>> view = create_initialized_view(
+    ...     question_three, name='+subscribe', form=form)
     >>> question_three.isSubscribed(getUtility(ILaunchBag).user)
     True
 
 A notification message is displayed and the view redirect to the question
 view page.
 
-    >>> for notice in request.notifications:
+    >>> for notice in view.request.notifications:
     ...     print notice.message
     You have subscribed to this question.
-    >>> request.response.getHeader('Location')
+
+    >>> view.request.response.getHeader('Location')
     '.../+question/3'
 
 Unsubscription works in a similar manner.
 
-    >>> request = LaunchpadTestRequest(form={'subscribe': 'Unsubscribe'})
-    >>> request.method = 'POST'
-    >>> view = getMultiAdapter((question_three, request), name='+subscribe')
-    >>> view.initialize()
+    >>> view = create_initialized_view(question_three, name='+subscribe')
+    >>> print view.label
+    Unsubscribe from question
+
+    >>> form = {'subscribe': 'Unsubscribe'}
+    >>> view = create_initialized_view(
+    ...     question_three, name='+subscribe', form=form)
     >>> question_three.isSubscribed(getUtility(ILaunchBag).user)
     False
-    >>> for notice in request.notifications:
+
+    >>> for notice in view.request.notifications:
     ...     print notice.message
     You have unsubscribed from this question.
-    >>> request.response.getHeader('Location')
+
+    >>> view.request.response.getHeader('Location')
     '.../+question/3'
 
 These two actions didn't generate any notification mails:
@@ -503,6 +515,13 @@
     >>> print question_three.whiteboard
     Some note
 
+The question language can be set to any language registered with
+Launchpad--it is not restricted to the user's preferred languages.
+
+    >>> view = create_initialized_view(question_three, name='+edit')
+    >>> view.widgets['language'].vocabulary
+    <canonical.launchpad.vocabularies.dbobjects.LanguageVocabulary ...>
+
 In a similar manner, the sourcepackagename field can only be updated on
 a distribution question:
 
 
=== modified file 'lib/lp/answers/interfaces/faq.py'
--- lib/lp/answers/interfaces/faq.py	2009-07-17 00:26:05 +0000
+++ lib/lp/answers/interfaces/faq.py	2009-12-05 17:20:55 +0000
@@ -38,7 +38,7 @@
 
     title = Title(
         title=_('Title'),
-        description=_('The title describing the FAQ, often a question.'),
+        description=_('The title describing this FAQ, often a question.'),
         required=True)
 
     keywords = TextLine(
@@ -49,7 +49,7 @@
     content = Text(
         title=_('Content'),
         description=_(
-            'The answer to the question in plain text. You may choose to '
+            'The answer for this FAQ in plain text. You may choose to '
             'include a URL to an external FAQ.'),
         required=True)
 
 
=== modified file 'lib/lp/answers/interfaces/question.py'
--- lib/lp/answers/interfaces/question.py	2009-07-17 00:26:05 +0000
+++ lib/lp/answers/interfaces/question.py	2009-12-05 17:20:55 +0000
@@ -486,7 +486,7 @@
     message = Text(
         title=_('Answer Message'),
         description=_(
-            'Enter a message that will be added as the question answer. '
+            'Enter a comment that will be added as the question comments. '
             'The title of the FAQ will be automatically appended to this '
             'message.'),
         required=True)
 
=== modified file 'lib/lp/answers/stories/question-subscriptions.txt'
--- lib/lp/answers/stories/question-subscriptions.txt	2009-09-25 08:39:54 +0000
+++ lib/lp/answers/stories/question-subscriptions.txt	2009-12-05 17:20:55 +0000
@@ -7,16 +7,18 @@
 == Subscribing ==
 
 To subscribe, users use the 'Subscribe' link and then confirm that
-they want to subscribe by clicking on the 'Subscribe' button.
+they want to subscribe by clicking on the 'Subscribe' button. The user
+sees a link to his subscribed questions.
 
     >>> user_browser.open(
     ...     'http://launchpad.dev/firefox/+question/2')
-    >>> link = user_browser.getLink('Subscribe')
-    >>> link.url
-    '.../+question/2/+subscribe'
-    >>> link.click()
+    >>> user_browser.getLink('Subscribe').click()
     >>> print user_browser.title
-    Subscription to question...
+    Subscription : Question #2 ...
+
+    >>> print user_browser.getLink('your subscribed questions page')
+    <Link ...'http://answers.launchpad.dev/~no-priv/+subscribedquestions'>
+
     >>> user_browser.getControl('Subscribe').click()
 
 A message confirming that he was subscribed is displayed and the user
@@ -26,11 +28,10 @@
     ...     print message
     You have subscribed to this question.
 
-    >>> portlet = find_tag_by_id(user_browser.contents, 'subscribers')
-    >>> portlet.first('h2')
-    <h2>Subscribers</h2>
-    >>> portlet.first('ul')
-    <ul> ...No Privileges Person...
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'subscribers'))
+    Subscribers
+    No Privileges Person
 
 
 == Unsubscribing ==
@@ -39,14 +40,14 @@
 becomes an 'Unsubscribe' link. To unsubscribe, the user follows that
 link and then click on the 'Unsubscribe' button.
 
-    >>> link = user_browser.getLink('Unsubscribe')
-    >>> link.url
-    '.../+question/2/+subscribe'
-    >>> link.click()
-
-    >>> soup = find_main_content(user_browser.contents)
-    >>> soup.first('h1')
-    <h1>Unsubscribe from question</h1>
+    >>> link = user_browser.getLink('Unsubscribe').click()
+    >>> print user_browser.title
+    Subscription : Question #2 ...
+
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'unsubscribe'))
+    Unsubscribing from this question ...
+
     >>> user_browser.getControl('Unsubscribe').click()
 
 A confirmation is displayed and the user, which was unsubscribed from
@@ -56,11 +57,10 @@
     ...     print message
     You have unsubscribed from this question.
 
-    >>> portlet = find_tag_by_id(user_browser.contents, 'subscribers')
-    >>> portlet.first('p')
-    <p>
-      <i>No subscribers.</i>
-    </p>
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'subscribers'))
+    Subscribers
+    No subscribers.
 
 
 == Subscribing While Posting A Message ==
 
=== modified file 'lib/lp/answers/stories/this-is-a-faq.txt'
--- lib/lp/answers/stories/this-is-a-faq.txt	2009-11-14 16:30:47 +0000
+++ lib/lp/answers/stories/this-is-a-faq.txt	2009-12-05 17:20:55 +0000
@@ -244,9 +244,13 @@
 There is a 'Message' field that will be used to answer the question.
 It is pre-filled, but he can change its value:
 
-    >>> print owner_browser.getControl('Message').value
+    >>> print owner_browser.getControl(
+    ...     'Additional comment for question #2').value
     Sample Person suggests this article as an answer to your question:
-    >>> owner_browser.getControl('Message').value = 'Read the Fine Answer:'
+
+    >>> owner_browser.getControl(
+    ...     'Additional comment for question #2').value = (
+    ...     'Read the Fine Answer:')
 
 After clicking the 'Create' button, the FAQ is created and the user is
 returned to the question page.
 
=== modified file 'lib/lp/answers/templates/question-subscription.pt'
--- lib/lp/answers/templates/question-subscription.pt	2009-08-12 19:54:50 +0000
+++ lib/lp/answers/templates/question-subscription.pt	2009-12-05 17:20:55 +0000
@@ -9,16 +9,20 @@
 
 <body>
 
-<tal:heading metal:fill-slot="heading">
-  <h1 tal:content="view/label">Subscribe to question</h1>
-</tal:heading>
-
 <div metal:fill-slot="main">
 
-  <p>
+  <p id="subscribe"
+    tal:condition="not: view/subscription">
     Subscribing to a question makes it show up on
-    <a tal:attributes="href string:/~${request/lp:person/name}/+questions"
-    >your Answers page</a>.
+    <a tal:attributes="href view/user/menu:navigation/subscribed/fmt:url"
+    >your subscribed questions page</a>. You will receive email notifications
+    about updates to this question.
+  </p>
+
+  <p id="unsubscribe" 
+    tal:condition="view/subscription">
+    Unsubscribing from this question will stop email notifications
+    about updates to this question.
   </p>
 
   <form action="."