diff --git a/pandora/app/config.py b/pandora/app/config.py index 1cced56c6..7349c6b1b 100644 --- a/pandora/app/config.py +++ b/pandora/app/config.py @@ -73,9 +73,13 @@ def update_static(): pandora_json = os.path.join(settings.STATIC_ROOT, 'json/pandora.json') for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js/pandora')): for f in files: - if f.endswith('.js'): - js.append(os.path.join(root, f)[len(settings.STATIC_ROOT)+1:]) - with open(os.path.join(root, f)) as j: + if f.endswith('.js') and len(f.split('.')) == 2: + f = os.path.join(root, f) + fsite = f.replace('.js', '.%s.js' % settings.SITENAME) + if os.path.exists(fsite): + f = fsite + js.append(f[len(settings.STATIC_ROOT)+1:]) + with open(f) as j: data += j.read() + '\n' print 'write', pandora_js diff --git a/pandora/item/views.py b/pandora/item/views.py index a64821ec4..977b319e6 100644 --- a/pandora/item/views.py +++ b/pandora/item/views.py @@ -405,27 +405,6 @@ def get(request): return render_to_json_response(response) actions.register(get) -def getItem(request): - ''' - param data - string id - - return item array - ''' - response = json_response({}) - itemId = json.loads(request.POST['data']) - item = get_object_or_404_json(models.Item, itemId=itemId) - if item.access(request.user): - info = item.get_json() - info['stream'] = item.get_stream() - info['layers'] = item.get_layers(request.user) - response['data'] = info - else: - response = json_response(status=403, text='permission denied') - return render_to_json_response(response) -actions.register(getItem) - - @login_required_json def edit(request): '''