Merge lp:~stevenk/launchpad/kill-+viewstatus into lp:launchpad

[Steve Kowalik]

[r=allenap,rvb][bug=125173] Consign BugTask:+viewstatus to The Great Bitbucket in the Sky.

Consign BugTask:+viewstatus to The Great Bitbucket in the Sky.

[Raphaël Badin (rvb)]

This branch looks good to land (+5/-247: that's just great ;)).

review: Approve (code*)

[Gavin Panella (allenap)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/textformatting.txt'
--- lib/canonical/launchpad/doc/textformatting.txt	2011-03-11 00:04:26 +0000
+++ lib/canonical/launchpad/doc/textformatting.txt	2011-10-03 03:02:25 +0000
@@ -126,13 +126,13 @@
 
     >>> long_word = (
     ...     "This paragraph includes a long URL, "
-    ...     "https://launchpad.net/greenishballoon/+bug/1733/+viewstatus. "
+    ...     "https://launchpad.net/greenishballoon/+bug/1733/+subscriptions. "
     ...     "Even though it's longer than 56 characters, it stays on a "
     ...     "single line.")
     >>> wrapped_text = mailwrapper.format(long_word)
     >>> print wrapped_text #doctest: -NORMALIZE_WHITESPACE
     This paragraph includes a long URL,
-    https://launchpad.net/greenishballoon/+bug/1733/+viewstatus.
+    https://launchpad.net/greenishballoon/+bug/1733/+subscriptions.
     Even though it's longer than 56 characters, it stays on
     a single line.
 

=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2011-09-01 05:09:54 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2011-10-03 03:02:25 +0000
@@ -316,7 +316,7 @@
 bugtask is also assigned to a milestone (a corner case, but one that was causing
 OOPS's all the same!):
 
->>> check("/debian/sarge/+source/mozilla-firefox/+bug/3/+viewstatus")
+>>> check("/debian/sarge/+source/mozilla-firefox/+bug/3")
 
 The bug filing pages.
 

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2011-09-30 06:31:35 +0000
+++ lib/lp/bugs/browser/bugtask.py	2011-10-03 03:02:25 +0000
@@ -29,7 +29,6 @@
     'BugTasksAndNominationsView',
     'BugTaskSearchListingView',
     'BugTaskSetNavigation',
-    'BugTaskStatusView',
     'BugTaskTableRowView',
     'BugTaskTextView',
     'BugTaskView',
@@ -84,14 +83,10 @@
 from zope.app.form import CustomWidgetFactory
 from zope.app.form.browser.itemswidgets import RadioWidget
 from zope.app.form.interfaces import (
-    IDisplayWidget,
     IInputWidget,
     InputErrors,
     )
-from zope.app.form.utility import (
-    setUpWidget,
-    setUpWidgets,
-    )
+from zope.app.form.utility import setUpWidget
 from zope.component import (
     ComponentLookupError,
     getAdapter,
@@ -1737,36 +1732,6 @@
         self.updateContextFromData(data)
 
 
-class BugTaskStatusView(LaunchpadView):
-    """Viewing the status of a bug task."""
-
-    page_title = 'View status'
-
-    def initialize(self):
-        """Set up the appropriate widgets.
-
-        Different widgets are shown depending on if it's a remote bug
-        task or not.
-        """
-        field_names = [
-            'status', 'importance', 'assignee']
-        if not self.context.target_uses_malone:
-            field_names += ['bugwatch']
-            self.milestone_widget = None
-        else:
-            field_names += ['milestone']
-            self.bugwatch_widget = None
-
-        if self.context.distroseries or self.context.distribution:
-            field_names += ['sourcepackagename']
-
-        self.assignee_widget = CustomWidgetFactory(AssigneeDisplayWidget)
-        self.status_widget = CustomWidgetFactory(DBItemDisplayWidget)
-        self.importance_widget = CustomWidgetFactory(DBItemDisplayWidget)
-
-        setUpWidgets(self, IBugTask, IDisplayWidget, names=field_names)
-
-
 class BugTaskListingView(LaunchpadView):
     """A view designed for displaying bug tasks in lists."""
     # Note that this right now is only used in tests and to render
@@ -3559,10 +3524,8 @@
     def initialize(self):
         super(BugTaskTableRowView, self).initialize()
         link = canonical_url(self.context)
-        edit_link = link + '/+editstatus'
-        view_link = link + '/+viewstatus'
+        task_link = edit_link = link + '/+editstatus'
         can_edit = check_permission('launchpad.Edit', self.context)
-        task_link = edit_link if can_edit else view_link
         bugtask_id = self.context.id
         launchbag = getUtility(ILaunchBag)
         is_primary = self.context.id == launchbag.bugtask.id
@@ -3575,7 +3538,6 @@
             is_conjoined_slave=self.is_conjoined_slave,
             task_link=task_link,
             edit_link=edit_link,
-            view_link=view_link,
             can_edit=can_edit,
             link=link,
             id=bugtask_id,

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2011-09-29 07:12:45 +0000
+++ lib/lp/bugs/browser/configure.zcml	2011-10-03 03:02:25 +0000
@@ -687,12 +687,6 @@
             permission="launchpad.Edit"
             template="../templates/bugtask-edit-form.pt" />
         <browser:page
-            name="+viewstatus"
-            for="lp.bugs.interfaces.bugtask.IBugTask"
-            class="lp.bugs.browser.bugtask.BugTaskStatusView"
-            permission="launchpad.View"
-            template="../templates/bugtask-view.pt"/>
-        <browser:page
             name="+listing-view"
             for="lp.bugs.interfaces.bugtask.IBugTask"
             class="lp.bugs.browser.bugtask.BugTaskListingView"

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt	2010-07-15 08:38:19 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt	2011-10-03 03:02:25 +0000
@@ -18,18 +18,6 @@
     >>> description.renderContents()
     '...<p>Shirtpkdf [e-mail] lkjd hlkjfds...'
 
-Using the +viewstatus page, he can also see the email address.
-
-    >>> user_browser.open(
-    ...     'http://bugs.launchpad.dev'
-    ...     '/debian/sarge/+source/mozilla-firefox/+bug/3/+viewstatus')
-    >>> print user_browser.title
-    View status : Bug #3 : ...
-
-    >>> description = find_main_content(user_browser.contents).p
-    >>> description.renderContents()
-    'Shirtpkdf [e-mail] lkjd hlkjfds...'
-
 An anonymous cannot see the email address anywhere in the page.
 
     >>> anon_browser.open(
@@ -44,20 +32,3 @@
     >>> description = find_tag_by_id(anon_browser.contents, 'edit-description')
     >>> description.renderContents()
     '...<p>Shirtpkdf &lt;email address hidden&gt; lkjd hlkjfds...'
-
-Nor can the anonymous user see the email address in the +viewstatus
-page.
-
-    >>> anon_browser.open(
-    ...     'http://bugs.launchpad.dev'
-    ...     '/debian/sarge/+source/mozilla-firefox/+bug/3/+viewstatus')
-    >>> print anon_browser.title
-    View status : Bug #3 : ...
-
-    >>> '[e-mail]' in anon_browser.contents
-    False
-
-    >>> description = find_main_content(anon_browser.contents).findAll('p')[1]
-    >>> description.renderContents()
-    'Shirtpkdf &lt;email address hidden&gt; lkjd hlkjfds...'
-

=== removed file 'lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-If someone views a bug task without logging in, they should see the task but
-not be able to edit it.
-
-    >>> anon_browser.open('http://launchpad.dev/firefox/+bug/6/+viewstatus')
-    >>> print extract_text(find_main_content(anon_browser.contents))
-    Mozilla Firefox Bug #6
-    ...
-    To change this information, you must be logged in.
-    ...
-
-    >>> anon_browser.open('http://launchpad.dev/evolution/+bug/7/+viewstatus')
-    >>> print extract_text(find_main_content(anon_browser.contents))
-    Evolution Bug #7
-    ...
-    To change this information, you must be logged in.
-    ...

=== removed file 'lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt'
--- lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-Anonymous users can view bug tasks on public bugs.
-
-  >>> print http(r"""
-  ... GET /debian/+source/mozilla-firefox/+bug/3/+viewstatus HTTP/1.1
-  ... """) #doctest: -NORMALIZE_WHITESPACE
-  HTTP/1.1 200 Ok
-  ...Package...
-  ...mozilla-firefox...

=== removed file 'lib/lp/bugs/templates/bugtask-view.pt'
--- lib/lp/bugs/templates/bugtask-view.pt	2011-09-08 22:50:59 +0000
+++ lib/lp/bugs/templates/bugtask-view.pt	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/main_only"
->
-  <body>
-    <div metal:fill-slot="main">
-      <p tal:condition="context/bug/duplicateof" class="informational message">
-        This bug is a duplicate of
-        <a href="#"
-           tal:attributes="href context/bug/duplicateof/fmt:url">bug
-             #<span tal:replace="context/bug/duplicateof/id">42</span></a>
-      </p>
-
-      <p tal:condition="not: context/required:launchpad.Edit"
-         class="informational message">
-        <span tal:condition="not: request/lp:person">
-          To <a href="+editstatus">change this information</a>,
-          you must be logged in.
-        </span>
-      </p>
-
-      <div metal:define-macro="editform">
-          <div metal:define-macro="formbody">
-            <p class="error message"
-               tal:define="status view/update|nothing"
-               tal:condition="status"
-               tal:content="status" />
-            <p tal:define="errors view/errors|nothing"
-               tal:condition="errors"
-               class="error message">
-              There are <strong
-              tal:content="view/errors/count:len"
-              >6</strong>
-              problems with the information you entered.
-              Please correct them and try again.
-            </p>
-          </div>
-
-          <h2>Status in
-            <tal:target replace="context/bugtargetname">Firefox</tal:target>
-          </h2>
-
-          <div class="field">
-            <table>
-            <tr>
-              <td style="padding-right: 1em">
-                <label tal:attributes="for view/status_widget/name"
-                       tal:content="view/status_widget/label">
-                  Status
-                </label>
-              </td>
-              <td>
-                <label tal:attributes="for view/importance_widget/name"
-                       tal:content="view/importance_widget/label">
-                  Importance
-                </label>
-              </td>
-              <td tal:condition="python:context.milestone and view.milestone_widget">
-                <label tal:attributes="for view/milestone_widget/name"
-                       tal:content="view/milestone_widget/label">
-                  Target
-                </label>
-              </td>
-            </tr>
-            <tr>
-              <td tal:content="structure view/status_widget" />
-              <td tal:content="structure view/importance_widget" />
-              <td tal:condition="python:context.milestone and view.milestone_widget"
-                  tal:content="context/milestone/name"
-		  id="milestone">
-              </td>
-            </tr>
-            <tr tal:condition="python:context.distribution or
-                                      context.distroseries">
-              <td colspan="0">
-                <label tal:attributes="for view/sourcepackagename_widget/name"
-                       tal:content="view/sourcepackagename_widget/label">
-                  Status
-                </label>
-              </td>
-            </tr>
-            <tr tal:condition="python:context.distribution or
-                                      context.distroseries">
-              <td colspan="0"
-                  tal:content="context/sourcepackagename/name|nothing"
-                  style="white-space : nowrap;" />
-            </tr>
-            <tr>
-              <td colspan="2">
-                <label tal:attributes="for view/assignee_widget/name"
-                       tal:content="view/assignee_widget/label">
-                  Assignee
-                </label>
-              </td>
-              <td colspan="2">
-                <tal:block condition="view/bugwatch_widget">
-                  <label tal:attributes="for view/bugwatch_widget/name"
-                         tal:content="view/bugwatch_widget/label"
-                         style="white-space: nowrap">
-                    Remote Watch
-                  </label>
-                </tal:block>
-              </td>
-            </tr>
-            <tr>
-              <td style="white-space : nowrap;" colspan="2">
-                <span tal:replace="structure view/assignee_widget">
-                  Scott James Remnant
-                </span>
-              </td>
-              <td style="white-space : nowrap;" colspan="2"
-                tal:content="structure view/bugwatch_widget" />
-            </tr>
-            </table>
-          </div>
-
-          <tal:user condition="view/user">
-            <tal:description
-              define="global description context/bug/description/fmt:text-to-html" />
-          </tal:user>
-          <tal:not-user condition="not:view/user">
-            <tal:description
-              define="global description context/bug/description/fmt:obfuscate-email/fmt:text-to-html" />
-          </tal:not-user>
-
-          <h2>Bug description</h2>
-          <tal:description
-            content="structure description"
-          >
-            $Bug.description
-          </tal:description>
-
-      </div>
-    </div>
-  </body>
-</html>

=== modified file 'lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt'
--- lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt	2009-09-14 15:03:45 +0000
+++ lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt	2011-10-03 03:02:25 +0000
@@ -49,12 +49,3 @@
     ...     name='ubuntu_mozilla-firefox.milestone')
     >>> milestone_control.value = [str(milestone.id)]
     >>> name12_browser.getControl('Save Changes').click()
-
-Verify that the bug now has the milestone set on the view page:
-
-    >>> anon_browser.open(
-    ...     'http://launchpad.dev/ubuntu/+source/mozilla-firefox/+bug/1/'
-    ...     '+viewstatus')
-    >>> milestone_tag = find_tag_by_id(anon_browser.contents, 'milestone')
-    >>> print str(extract_text(milestone_tag))
-    sounder01

=== modified file 'lib/lp/registry/stories/person/xx-deactivate-account.txt'
--- lib/lp/registry/stories/person/xx-deactivate-account.txt	2010-03-16 12:45:53 +0000
+++ lib/lp/registry/stories/person/xx-deactivate-account.txt	2011-10-03 03:02:25 +0000
@@ -54,12 +54,16 @@
 assignee.
 
     >>> browser.open('http://launchpad.dev/debian/+source/'
-    ...     'mozilla-firefox/+bug/3/+viewstatus')
+    ...     'mozilla-firefox/+bug/3')
     >>> print extract_text(find_main_content(browser.contents))
+    Bug Title Test
     Debian
-    ...
+    “mozilla-firefox” package
     Bug #3
-    ...Assigned to unknown...
+    ...
+    Assigned to
+    Milestone
+    ...
 
 Although teams have NOACCOUNT as their account_status, they are teams and so
 it makes no sense to say they don't use Launchpad.