Merge pull request #3436 from FinnStutzenstein/Remarks

Fixed all remarks
This commit is contained in:
Norman Jäckel 2017-10-13 18:20:45 +02:00 committed by GitHub
commit 487b286b79
3 changed files with 20 additions and 15 deletions

View File

@ -101,6 +101,7 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda'])
if (result) {
$scope.rootItem = result.item;
$scope.tree = result.children;
return false;
}
});
} else if ($scope.element.tree) {

View File

@ -26,7 +26,13 @@ class Command(CollectStatic):
return super().handle(**options)
def collect(self) -> Dict[str, Any]:
destination_dir = os.path.join(settings.OS_STATICFILES_DIR, 'js')
try:
destination_dir = os.path.join(settings.STATICFILES_DIRS[0], 'js')
except IndexError:
# If the user does not want do have staticfiles, he should not get
# the webclient files either.
pass
else:
if not os.path.exists(destination_dir):
os.makedirs(destination_dir)

View File

@ -81,10 +81,8 @@ LOCALE_PATHS = [
STATIC_URL = '/static/'
OS_STATICFILES_DIR = os.path.join(MODULE_DIR, 'static')
STATICFILES_DIRS = [
OS_STATICFILES_DIR,
os.path.join(MODULE_DIR, 'static'),
]