Mercurial > libervia-backend
diff src/memory/params.py @ 1367:f71a0fc26886
merged branch frontends_multi_profiles
author | Goffi <goffi@goffi.org> |
---|---|
date | Wed, 18 Mar 2015 10:52:28 +0100 |
parents | faa1129559b8 |
children | 069ad98b360d |
line wrap: on
line diff
--- a/src/memory/params.py Thu Feb 05 11:59:26 2015 +0100 +++ b/src/memory/params.py Wed Mar 18 10:52:28 2015 +0100 @@ -49,14 +49,14 @@ <param name="%(show_empty_groups)s" label="%(show_empty_groups_label)s" value="true" type="bool" security="0" /> </category> <category name="Connection" label="%(category_connection)s"> - <param name="JabberID" value="name@example.org/SàT" type="string" /> + <param name="JabberID" value="name@example.org/SàT" type="string" security="0" /> <param name="Password" value="" type="password" /> <param name="Priority" value="50" type="int" constraint="-128;127"/> <param name="%(force_server_param)s" value="" type="string" /> <param name="%(force_port_param)s" value="" type="int" constraint="1;65535" /> <param name="NewAccount" label="%(new_account_label)s" type="button" callback_id="registerNewAccount"/> - <param name="autoconnect" label="%(autoconnect_label)s" value="true" type="bool" /> - <param name="autodisconnect" label="%(autodisconnect_label)s" value="false" type="bool" /> + <param name="autoconnect" label="%(autoconnect_label)s" value="true" type="bool" security="0" /> + <param name="autodisconnect" label="%(autodisconnect_label)s" value="false" type="bool" security="0" /> </category> <category name="Misc" label="%(category_misc)s"> <param name="Watched" value="test@Jabber.goffi.int" type="string" /> @@ -179,7 +179,7 @@ return defer.fail(Failure(exceptions.ConnectedProfileError)) return self.storage.deleteProfile(profile) - def getProfileName(self, profile_key, return_profile_keys = False): + def getProfileName(self, profile_key, return_profile_keys=False): """return profile according to profile_key @param profile_key: profile name or key which can be @@ -473,12 +473,12 @@ node = self._getParamNode(name, category) if not node: log.error(_("Requested param [%(name)s] in category [%(category)s] doesn't exist !") % {'name': name, 'category': category}) - return defer.succeed(None) + raise ValueError("Requested param doesn't exist") if not self.checkSecurityLimit(node[1], security_limit): log.warning(_("Trying to get parameter '%(param)s' in category '%(cat)s' without authorization!!!" % {'param': name, 'cat': category})) - return defer.succeed(None) + raise exceptions.PermissionError if node[0] == C.GENERAL: value = self._getParam(category, name, C.GENERAL)