Merge pull request #3436 from FinnStutzenstein/Remarks
Fixed all remarks
This commit is contained in:
commit
487b286b79
@ -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) {
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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'),
|
||||
]
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user