Merge lp:~jcsackett/launchpad/distribution-enum-selection-677536 into lp:launchpad

[j.c.sackett]

[r=abentley][ui=none][bug=677536] Updates interface for distribution edit and add views to allow full range of usage options on answers and blueprints.

Summary
=======
Although internally distributions now use the usage enums phased in for bridging the gap, they don't expose those settings where appropriate.

This branch exposes them for answers and blueprints. Bugs and translations both require more in depth solutions, making them more appropriately separate bugs.

Proposed fix
============
Switch use of official_* booleans for *_usage enums in the field names for distribution. All other work was already done.

Preimplementation talk
======================
Spoke with Curtis Hovey and Robert Collins (via comments on bug) regarding scope.

Implementation details
======================
As in Proposed.

Tests
=====
bin/test -t distribution-views

Demo & QA
=========
Go to launchpad.dev/ubuntu/+edit; you should now have an enum selection for blue prints and answers.

Lint
====
make lint output:

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/browser/distribution.py
  lib/lp/registry/browser/tests/distribution-views.txt

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2010-11-23 23:22:27 +0000
+++ lib/lp/registry/browser/distribution.py	2010-11-30 15:26:33 +0000
@@ -741,9 +741,9 @@
         "domainname",
         "members",
         "official_malone",
-        "official_blueprints",
+        "blueprints_usage",
         "official_rosetta",
-        "official_answers",
+        "answers_usage",
         ]
 
     @property
@@ -787,9 +787,9 @@
         'mugshot',
         'official_malone',
         'enable_bug_expiration',
-        'official_blueprints',
+        'blueprints_usage',
         'official_rosetta',
-        'official_answers',
+        'answers_usage',
         'translation_focus',
         ]
 

=== modified file 'lib/lp/registry/browser/tests/distribution-views.txt'
--- lib/lp/registry/browser/tests/distribution-views.txt	2010-11-03 14:40:53 +0000
+++ lib/lp/registry/browser/tests/distribution-views.txt	2010-11-30 15:26:33 +0000
@@ -51,8 +51,8 @@
 
     >>> view.field_names
     ['name', 'displayname', 'title', 'summary', 'description', 'domainname',
-     'members', 'official_malone', 'official_blueprints', 'official_rosetta',
-     'official_answers']
+     'members', 'official_malone', 'blueprints_usage', 'official_rosetta',
+     'answers_usage']
 
     >>> login("[e-mail]")
     >>> form = {
@@ -113,7 +113,7 @@
     ['displayname', 'title', 'summary', 'description',
      'bug_reporting_guidelines', 'bug_reported_acknowledgement', 'icon',
      'logo', 'mugshot', 'official_malone', 'enable_bug_expiration',
-     'official_blueprints', 'official_rosetta', 'official_answers',
+     'blueprints_usage', 'official_rosetta', 'answers_usage',
      'translation_focus']
 
     >>> del form['field.name']

=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.txt'
--- lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.txt	2010-09-30 21:00:37 +0000
+++ lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.txt	2010-11-30 15:26:33 +0000
@@ -31,10 +31,10 @@
     True
     >>> print registrant.getControl(name='field.enable_bug_expiration').value
     True
-    >>> print registrant.getControl(name='field.official_blueprints').value
-    True
-    >>> print registrant.getControl(name='field.official_answers').value
-    True
+    >>> print registrant.getControl(name='field.blueprints_usage').value[0]
+    LAUNCHPAD
+    >>> print registrant.getControl(name='field.answers_usage').value[0]
+    LAUNCHPAD
 
     >>> registrant.getControl(name='field.official_rosetta').value = False
     >>> registrant.getControl('Change', index=3).click()
@@ -52,17 +52,17 @@
     >>> print admin_browser.getControl(
     ...     name='field.enable_bug_expiration').value
     True
-    >>> print admin_browser.getControl(name='field.official_blueprints').value
-    True
-    >>> print admin_browser.getControl(name='field.official_answers').value
-    True
+    >>> print admin_browser.getControl(name='field.blueprints_usage').value[0]
+    LAUNCHPAD
+    >>> print admin_browser.getControl(name='field.answers_usage').value[0]
+    LAUNCHPAD
 
     >>> admin_browser.getControl(
     ...     name='field.enable_bug_expiration').value = False
     >>> admin_browser.getControl(name='field.official_malone').value = False
-    >>> admin_browser.getControl(name='field.official_blueprints').value = (
-    ... False)
-    >>> admin_browser.getControl(name='field.official_answers').value = False
+    >>> admin_browser.getControl(name='field.blueprints_usage').value = (
+    ... ['UNKNOWN'])
+    >>> admin_browser.getControl(name='field.answers_usage').value = ['UNKNOWN']
     >>> admin_browser.getControl('Change', index=3).click()
 
     >>> print admin_browser.url