=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg 2010-01-17 09:15:43 +0000
+++ database/schema/security.cfg 2010-01-22 21:50:26 +0000
@@ -410,6 +410,8 @@
# Dyson release import script
type=user
groups=script
+public.bug = SELECT
+public.bugtask = SELECT, UPDATE
public.product = SELECT
public.productseries = SELECT
public.productrelease = SELECT, INSERT, UPDATE
@@ -420,6 +422,7 @@
public.libraryfilealias = SELECT, INSERT
public.libraryfilecontent = SELECT, INSERT
public.milestone = SELECT, INSERT
+public.sourcepackagename = SELECT
[pofilestats]
# Translations POFile statistics verification/update script
=== modified file 'lib/canonical/launchpad/subscribers/karma.py'
--- lib/canonical/launchpad/subscribers/karma.py 2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/subscribers/karma.py 2010-01-22 21:50:26 +0000
@@ -100,13 +100,19 @@
actionname_status_mapping = {
BugTaskStatus.FIXRELEASED: 'bugfixed',
BugTaskStatus.INVALID: 'bugrejected',
- BugTaskStatus.CONFIRMED: 'bugaccepted'}
+ BugTaskStatus.CONFIRMED: 'bugaccepted',
+ BugTaskStatus.TRIAGED: 'bugaccepted',
+ }
if task_delta.status:
new_status = task_delta.status['new']
actionname = actionname_status_mapping.get(new_status)
if actionname is not None:
- _assign_karma_using_bugtask_context(user, bugtask, actionname)
+ if actionname == 'bugfixed' and bugtask.assignee is not None:
+ _assign_karma_using_bugtask_context(
+ bugtask.assignee, bugtask, actionname)
+ else:
+ _assign_karma_using_bugtask_context(user, bugtask, actionname)
if task_delta.importance is not None:
_assign_karma_using_bugtask_context(
=== modified file 'lib/lp/bugs/doc/malone-karma.txt'
--- lib/lp/bugs/doc/malone-karma.txt 2009-07-23 17:49:31 +0000
+++ lib/lp/bugs/doc/malone-karma.txt 2010-01-22 21:50:26 +0000
@@ -79,6 +79,24 @@
>>> notify(ObjectModifiedEvent(bugtask, old_bugtask, ['status']))
Karma added: action=bugfixed, distribution=debian
+Mark a bug task as fixed when it is assigned awards the karma to the assignee:
+
+ >>> from lp.bugs.interfaces.bugtask import IUpstreamBugTask
+
+ >>> ufo_product = factory.makeProduct(name='ufo')
+ >>> assignee = factory.makePerson(name='assignee')
+ >>> assigned_bugtask = factory.makeBugTask(bug=bug, target=ufo_product)
+ >>> assigned_bugtask.transitionToAssignee(assignee)
+ >>> old_bugtask = Snapshot(assigned_bugtask, providing=IUpstreamBugTask)
+ >>> assigned_bugtask.transitionToStatus(
+ ... BugTaskStatus.FIXRELEASED, getUtility(ILaunchBag).user)
+ >>> notify(ObjectModifiedEvent(assigned_bugtask, old_bugtask, ['status']))
+ Karma added: action=bugfixed, product=ufo
+
+ >>> for karma in assignee.latestKarma():
+ ... print karma.action.name
+ bugfixed
+
Reject a bug task:
>>> old_bugtask = Snapshot(bugtask, providing=IDistroBugTask)
@@ -87,7 +105,7 @@
>>> notify(ObjectModifiedEvent(bugtask, old_bugtask, ['status']))
Karma added: action=bugrejected, distribution=debian
-Accept a bug task:
+User accept a bug task:
>>> old_bugtask = Snapshot(bugtask, providing=IDistroBugTask)
>>> bugtask.transitionToStatus(
@@ -95,6 +113,17 @@
>>> notify(ObjectModifiedEvent(bugtask, old_bugtask, ['status']))
Karma added: action=bugaccepted, distribution=debian
+Driver accept a bug task:
+
+ >>> login_person(bugtask.target.owner)
+ >>> old_bugtask = Snapshot(bugtask, providing=IDistroBugTask)
+ >>> bugtask.transitionToStatus(
+ ... BugTaskStatus.TRIAGED, getUtility(ILaunchBag).user)
+ >>> notify(ObjectModifiedEvent(bugtask, old_bugtask, ['status']))
+ Karma added: action=bugaccepted, distribution=debian
+
+ >>> login('admin@canonical.com')
+
Change a bug task's importance:
>>> from canonical.launchpad.interfaces import BugTaskImportance
@@ -183,6 +212,7 @@
>>> notify(ObjectModifiedEvent(bug, old_bug, ['duplicateof']))
Karma added: action=bugmarkedasduplicate, product=evolution
Karma added: action=bugmarkedasduplicate, product=evolution
+ Karma added: action=bugmarkedasduplicate, product=ufo
Karma added: action=bugmarkedasduplicate, distribution=debian
Karma added: action=bugmarkedasduplicate, distribution=debian
@@ -194,6 +224,7 @@
>>> notify(ObjectCreatedEvent(comment))
Karma added: action=bugcommentadded, product=evolution
Karma added: action=bugcommentadded, product=evolution
+ Karma added: action=bugcommentadded, product=ufo
Karma added: action=bugcommentadded, distribution=debian
Karma added: action=bugcommentadded, distribution=debian
=== modified file 'lib/lp/registry/browser/productrelease.py'
--- lib/lp/registry/browser/productrelease.py 2009-12-09 11:47:58 +0000
+++ lib/lp/registry/browser/productrelease.py 2010-01-22 21:50:26 +0000
@@ -39,7 +39,6 @@
action, canonical_url, ContextMenu, custom_widget,
enabled_with_permission, LaunchpadEditFormView, LaunchpadFormView,
LaunchpadView, Link, Navigation, stepthrough)
-from canonical.launchpad.webapp.menu import structured
from canonical.widgets import DateTimeWidget
from lp.registry.browser import MilestoneOverlayMixin, RegistryDeleteViewMixin
@@ -119,10 +118,6 @@
milestone.active = False
milestone_link = '%s milestone' % (
canonical_url(milestone), cgi.escape(milestone.name))
- self.request.response.addWarningNotification(structured(
- _("The %s for this project release was deactivated "
- "so that bugs and blueprints cannot be associated with "
- "this release." % milestone_link)))
self.next_url = canonical_url(newrelease.milestone)
notify(ObjectCreatedEvent(newrelease))
=== modified file 'lib/lp/registry/browser/tests/productrelease-views.txt'
--- lib/lp/registry/browser/tests/productrelease-views.txt 2009-12-07 17:09:55 +0000
+++ lib/lp/registry/browser/tests/productrelease-views.txt 2010-01-22 21:50:26 +0000
@@ -50,12 +50,6 @@
>>> print view.widget_errors
{}
- >>> for notification in view.request.response.notifications:
- ... print notification.message
- The 0.1 milestone
- for this project release was deactivated so that bugs and blueprints
- cannot be associated with this release.
-
>>> print milestone.active
False
=== modified file 'lib/lp/registry/doc/milestone.txt'
--- lib/lp/registry/doc/milestone.txt 2009-11-06 21:06:38 +0000
+++ lib/lp/registry/doc/milestone.txt 2010-01-22 21:50:26 +0000
@@ -506,3 +506,26 @@
...
AssertionError: You cannot delete a milestone which has structural
subscriptions.
+
+
+Creating a release from a milestone with targeted bugs
+------------------------------------------------------
+
+When a milestone with bug tasks creates a release, those bug tasks in fix
+committed status are updated to fix released.
+
+ >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
+
+ >>> milestone = ff_onedotzero.newMilestone('kia')
+ >>> fixed_bugtask = factory.makeBugTask(target=upstream_firefox)
+ >>> fixed_bugtask.transitionToMilestone(milestone, owner)
+ >>> fixed_bugtask.transitionToStatus(BugTaskStatus.FIXCOMMITTED, owner)
+ >>> triaged_bugtask = factory.makeBugTask(target=upstream_firefox)
+ >>> triaged_bugtask.transitionToMilestone(milestone, owner)
+ >>> triaged_bugtask.transitionToStatus(BugTaskStatus.TRIAGED, owner)
+ >>> release = milestone.createProductRelease(owner, datetime.now(UTC))
+ >>> fixed_bugtask.status
+
+
+ >>> triaged_bugtask.status
+
=== modified file 'lib/lp/registry/model/milestone.py'
--- lib/lp/registry/model/milestone.py 2009-12-05 18:37:28 +0000
+++ lib/lp/registry/model/milestone.py 2010-01-22 21:50:26 +0000
@@ -31,7 +31,7 @@
from lp.registry.model.structuralsubscription import (
StructuralSubscriptionTargetMixin)
from lp.bugs.interfaces.bugtask import (
- BugTaskSearchParams, IBugTaskSet)
+ BugTaskSearchParams, BugTaskStatus, IBugTaskSet)
from lp.bugs.interfaces.bugtarget import IHasBugs
from lp.registry.interfaces.milestone import (
IHasMilestones, IMilestone, IMilestoneSet, IProjectMilestone)
@@ -177,12 +177,16 @@
if self.product_release is not None:
raise AssertionError(
'A milestone can only have one ProductRelease.')
- return ProductRelease(
+ release = ProductRelease(
owner=owner,
changelog=changelog,
release_notes=release_notes,
datereleased=datereleased,
milestone=self)
+ for bugtask in self.open_bugtasks:
+ if bugtask.status == BugTaskStatus.FIXCOMMITTED:
+ bugtask.transitionToStatus(BugTaskStatus.FIXRELEASED, owner)
+ return release
def destroySelf(self):
"""See `IMilestone`."""
=== modified file 'lib/lp/registry/stories/productrelease/xx-productrelease-basics.txt'
--- lib/lp/registry/stories/productrelease/xx-productrelease-basics.txt 2009-11-26 03:06:58 +0000
+++ lib/lp/registry/stories/productrelease/xx-productrelease-basics.txt 2010-01-22 21:50:26 +0000
@@ -52,12 +52,6 @@
>>> browser.url
'http://launchpad.dev/firefox/+milestone/1.0'
-There is a warning that the milestone has been deactivated.
-
- >>> print get_feedback_messages(browser.contents)
- [u'The 1.0 milestone for this project release was deactivated so
- that bugs and blueprints cannot be associated with this release.']
-
The release's information is displayed in the page.
>>> print extract_text(find_tag_by_id(browser.contents, 'release-notes'))
=== modified file 'lib/lp/registry/stories/productrelease/xx-productrelease-view.txt'
--- lib/lp/registry/stories/productrelease/xx-productrelease-view.txt 2009-12-14 13:49:03 +0000
+++ lib/lp/registry/stories/productrelease/xx-productrelease-view.txt 2010-01-22 21:50:26 +0000
@@ -11,7 +11,6 @@
Series: trunk
Version: 0.9.2
Code name: One (secure) Tree Hill
- Expected:
Released: 2004-10-15
Registrant: Foo Bar
Release registered: 2005-06-06
=== modified file 'lib/lp/registry/templates/milestone-index.pt'
--- lib/lp/registry/templates/milestone-index.pt 2010-01-11 14:26:27 +0000
+++ lib/lp/registry/templates/milestone-index.pt 2010-01-22 21:50:26 +0000
@@ -67,7 +67,7 @@
-
+
- Expected: