← 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: Launchpad Patch Queue Manager
  • Date: 2011-08-04 18:33:35 UTC
  • mfrom: (13607.2.2 bug-820900)
  • Revision ID: launchpad@pqm.canonical.com-20110804183335-81w3lyus7i0xof1u
[r=allenap][bug=820900] Display an error when the filtering option
        passed is not a valid key.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/browser/distroseries.py
1078
1078
            ALL: DistroSeriesDifferenceStatus.items,
1079
1079
        }
1080
1080
 
1081
 
        status = package_type_dsd_status[self.specified_package_type]
1082
 
        child_version_higher = (
1083
 
            self.specified_package_type == HIGHER_VERSION_THAN_PARENT)
 
1081
        # If the package_type option is not supported, add an error to
 
1082
        # the field and return an empty list.
 
1083
        if self.specified_package_type not in package_type_dsd_status:
 
1084
            self.setFieldError('package_type', 'Invalid option')
 
1085
            differences = []
 
1086
        else:
 
1087
            status = package_type_dsd_status[self.specified_package_type]
 
1088
            child_version_higher = (
 
1089
                self.specified_package_type == HIGHER_VERSION_THAN_PARENT)
 
1090
            differences = getUtility(
 
1091
                IDistroSeriesDifferenceSource).getForDistroSeries(
 
1092
                    self.context, difference_type=self.differences_type,
 
1093
                    name_filter=self.specified_name_filter,
 
1094
                    status=status, child_version_higher=child_version_higher,
 
1095
                    packagesets=self.specified_packagesets_filter,
 
1096
                    changed_by=self.specified_changed_by_filter)
1084
1097
 
1085
 
        differences = getUtility(
1086
 
            IDistroSeriesDifferenceSource).getForDistroSeries(
1087
 
                self.context, difference_type=self.differences_type,
1088
 
                name_filter=self.specified_name_filter,
1089
 
                status=status, child_version_higher=child_version_higher,
1090
 
                packagesets=self.specified_packagesets_filter,
1091
 
                changed_by=self.specified_changed_by_filter)
1092
1098
        return BatchNavigator(differences, self.request)
1093
1099
 
1094
1100
    @cachedproperty