← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/branchmergeproposal.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-12-15 10:35:32 UTC
  • mfrom: (14517.1.3 new-bzr)
  • Revision ID: launchpad@pqm.canonical.com-20111215103532-q2m4uyk0r8ugiayx
[r=sinzui, poolie][bug=509016] Always load foreign plugins,
 but restrict probers to avoid accidentally opening foreign branches.
 (re-land)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/branchmergeproposal.py
50
50
    SQLBase,
51
51
    sqlvalues,
52
52
    )
53
 
from lp.services.database.lpstorm import (
 
53
from canonical.launchpad.interfaces.lpstorm import (
54
54
    IMasterStore,
55
55
    IStore,
56
56
    )
92
92
from lp.registry.interfaces.person import (
93
93
    IPerson,
94
94
    IPersonSet,
95
 
    validate_person,
96
95
    validate_public_person,
97
96
    )
98
97
from lp.registry.interfaces.product import IProduct
198
197
 
199
198
    reviewer = ForeignKey(
200
199
        dbName='reviewer', foreignKey='Person',
201
 
        storm_validator=validate_person, notNull=False,
 
200
        storm_validator=validate_public_person, notNull=False,
202
201
        default=None)
203
202
 
204
203
    @property