0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

Merge branch 'master' of git.0x2620.org:/pandora

Browse source
This commit is contained in:
rlx 2016-08-09 14:19:46 +02:00
commit 6050e5c702
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/app/config.py
View file

@ -128,8 +128,8 @@ def load_config(init=False):
if added: if added:
sys.stderr.write("adding default %s:\n\t" % section) sys.stderr.write("adding default %s:\n\t" % section)
sys.stderr.write("\n\t".join(added) + '\n\n') sys.stderr.write("\n\t".join(added) + '\n\n')
for key in ('language', ): for key in ('language', 'importMetadata'):
if not key in config: if key not in config:
sys.stderr.write("adding default value:\n\t\"%s\": %s,\n\n" % (key, json.dumps(default[key]))) sys.stderr.write("adding default value:\n\t\"%s\": %s,\n\n" % (key, json.dumps(default[key])))
config[key] = default[key] config[key] = default[key]

2
pandora/archive/views.py
View file

@ -740,7 +740,7 @@ def getMediaUrlInfo(request, data):
response = json_response() response = json_response()
response['data']['items'] = external.get_info(data['url']) response['data']['items'] = external.get_info(data['url'])
return render_to_json_response(response) return render_to_json_response(response)
actions.register(getMediaUrlInfo, cache=False) actions.register(getMediaUrlInfo, cache=True)
@login_required_json @login_required_json
def addMediaUrl(request, data): def addMediaUrl(request, data):