diff --git a/projectroles/app_settings.py b/projectroles/app_settings.py index 023718e5..103c8f32 100644 --- a/projectroles/app_settings.py +++ b/projectroles/app_settings.py @@ -201,7 +201,7 @@ def _validate_value_in_options( Ensure setting_value is present in setting_options. :param setting_value: String - :param setting_options: List of options (String or Integers) + :param setting_options: List of options :param project: Project object :param user: User object :raise: ValueError if type is not recognized @@ -218,15 +218,11 @@ def _validate_value_in_options( ', '.join(map(str, valid_options)), ) ) - else: + elif setting_options: opts = [ o[0] if isinstance(o, tuple) else o for o in setting_options ] - if ( - setting_options - and not callable(setting_options) - and setting_value not in opts - ): + if setting_value not in opts: raise ValueError( 'Choice "{}" not found in options ({})'.format( setting_value, ', '.join(map(str, setting_options))