diff --git a/gui/slick/views/apiBuilder.mako b/gui/slick/views/apiBuilder.mako index 9b8ae20b036bf8784aca317c137279de4c232285..aeef6b809d7dcd29c7b5ad7b64d5facf67c04b30 100644 --- a/gui/slick/views/apiBuilder.mako +++ b/gui/slick/views/apiBuilder.mako @@ -209,10 +209,10 @@ var episodes = ${episodes}; <span class="glyphicon glyphicon-remove text-muted" title="No"></span> % endif </td> - <td>${parameter_help['desc'] if 'desc' in parameter_help else ''}</td> - <td>${parameter_help['type'] if 'type' in parameter_help else ''}</td> - <td>${parameter_help['defaultValue'] if 'defaultValue' in parameter_help else ''}</td> - <td>${parameter_help['allowed_values'] if 'allowed_values' in parameter_help else ''}</td> + <td>${parameter_help.get('desc', '')}</td> + <td>${parameter_help.get('type', '')}</td> + <td>${parameter_help.get('defaultValue', '')}</td> + <td>${parameter_help.get('allowedValues', '')}</td> </tr> % endfor </tbody> @@ -223,8 +223,8 @@ var episodes = ${episodes}; % for parameter in parameters: <% parameter_help = parameters[parameter] - allowed_values = parameter_help['allowed_values'] if 'allowed_values' in parameter_help else '' - type = parameter_help['type'] if 'type' in parameter_help else '' + allowed_values = parameter_help.get('allowedValues', '') + type = parameter_help.get('type', '') %> % if isinstance(allowed_values, list): diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py index f1f995748b403b74500cf2e16b73ec8a70af77f8..8c6bb80caa8d3e6cd67048874a951de43fec0265 100644 --- a/sickbeard/webapi.py +++ b/sickbeard/webapi.py @@ -305,10 +305,10 @@ class ApiCall(ApiHandler): for paramName in paramDict: if paramName not in self._help[paramType]: self._help[paramType][paramName] = {} - if paramDict[paramName]["allowed_values"]: - self._help[paramType][paramName]["allowed_values"] = paramDict[paramName]["allowed_values"] + if paramDict[paramName]["allowedValues"]: + self._help[paramType][paramName]["allowedValues"] = paramDict[paramName]["allowedValues"] else: - self._help[paramType][paramName]["allowed_values"] = "see desc" + self._help[paramType][paramName]["allowedValues"] = "see desc" self._help[paramType][paramName]["defaultValue"] = paramDict[paramName]["defaultValue"] self._help[paramType][paramName]["type"] = paramDict[paramName]["type"] @@ -362,7 +362,7 @@ class ApiCall(ApiHandler): self._requiredParams.append(key) except AttributeError: self._missing = [] - self._requiredParams = {key: {"allowed_values": allowed_values, + self._requiredParams = {key: {"allowedValues": allowed_values, "defaultValue": org_default, "type": arg_type}} @@ -370,11 +370,11 @@ class ApiCall(ApiHandler): self._missing.append(key) else: try: - self._optionalParams[key] = {"allowed_values": allowed_values, + self._optionalParams[key] = {"allowedValues": allowed_values, "defaultValue": org_default, "type": arg_type} except AttributeError: - self._optionalParams = {key: {"allowed_values": allowed_values, + self._optionalParams = {key: {"allowedValues": allowed_values, "defaultValue": org_default, "type": arg_type}}