← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/browser/distroseries.py

  • Committer: Julian Edwards
  • Date: 2011-07-28 20:46:18 UTC
  • mfrom: (13553 devel)
  • mto: This revision was merged to the branch mainline in revision 13555.
  • Revision ID: julian.edwards@canonical.com-20110728204618-tivj2wx2oa9s32bx
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/browser/distroseries.py
747
747
 
748
748
# A helper to create package filtering radio button vocabulary.
749
749
NON_IGNORED = 'non-ignored'
750
 
IGNORED = 'ignored'
751
750
HIGHER_VERSION_THAN_PARENT = 'higher-than-parent'
752
751
RESOLVED = 'resolved'
 
752
ALL = 'all'
753
753
 
754
754
DEFAULT_PACKAGE_TYPE = NON_IGNORED
755
755
 
756
756
 
757
757
def make_package_type_vocabulary(parent_name, higher_version_option=False):
758
758
    voc = [
759
 
        SimpleTerm(
760
 
            NON_IGNORED, NON_IGNORED, 'Non ignored packages'),
761
 
        SimpleTerm(IGNORED, IGNORED, 'Ignored packages'),
762
 
        SimpleTerm(RESOLVED, RESOLVED, "Resolved package differences")]
 
759
        SimpleTerm(NON_IGNORED, NON_IGNORED, 'Non ignored packages'),
 
760
        SimpleTerm(RESOLVED, RESOLVED, "Resolved package differences"),
 
761
        SimpleTerm(ALL, ALL, 'All packages'),
 
762
        ]
763
763
    if higher_version_option:
764
764
        higher_term = SimpleTerm(
765
765
            HIGHER_VERSION_THAN_PARENT,
766
766
            HIGHER_VERSION_THAN_PARENT,
767
767
            "Ignored packages with a higher version than in %s"
768
768
                % parent_name)
769
 
        voc.insert(2, higher_term)
 
769
        voc.insert(1, higher_term)
770
770
    return SimpleVocabulary(tuple(voc))
771
771
 
772
772
 
808
808
 
809
809
    # Differences type to display. Can be overrided by sublasses.
810
810
    differences_type = DistroSeriesDifferenceType.DIFFERENT_VERSIONS
 
811
    show_parent = True
811
812
    show_parent_version = True
812
813
    show_derived_version = True
813
814
    show_package_diffs = True
1058
1059
        package_type_dsd_status = {
1059
1060
            NON_IGNORED: (
1060
1061
                DistroSeriesDifferenceStatus.NEEDS_ATTENTION,),
1061
 
            IGNORED: DistroSeriesDifferenceStatus.BLACKLISTED_CURRENT,
1062
1062
            HIGHER_VERSION_THAN_PARENT: (
1063
1063
                DistroSeriesDifferenceStatus.BLACKLISTED_CURRENT),
1064
1064
            RESOLVED: DistroSeriesDifferenceStatus.RESOLVED,
 
1065
            ALL: DistroSeriesDifferenceStatus.items,
1065
1066
        }
1066
1067
 
1067
1068
        status = package_type_dsd_status[self.specified_package_type]
1252
1253
    """
1253
1254
    page_title = 'Unique packages'
1254
1255
    differences_type = DistroSeriesDifferenceType.UNIQUE_TO_DERIVED_SERIES
1255
 
    show_parent_version = False
 
1256
    show_parent = True
 
1257
    show_parent_version = False  # The DSDs are unique to the derived series.
1256
1258
    show_package_diffs = False
1257
1259
    show_packagesets = True
1258
1260