ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3436 from FinnStutzenstein/Remarks

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/agenda/static/js/agenda/projector.js
View File

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

30
openslides/core/management/commands/collectstatic.py
View File

@ -26,18 +26,24 @@ class Command(CollectStatic):
return super().handle(**options) return super().handle(**options)
def collect(self) -> Dict[str, Any]: def collect(self) -> Dict[str, Any]:
destination_dir = os.path.join(settings.OS_STATICFILES_DIR, 'js') try:
if not os.path.exists(destination_dir): destination_dir = os.path.join(settings.STATICFILES_DIRS[0], 'js')
os.makedirs(destination_dir) 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)
for realm in self.realms: for realm in self.realms:
filename = self.js_filename.format(realm) filename = self.js_filename.format(realm)
content = self.view.get(realm=realm).content content = self.view.get(realm=realm).content
path = os.path.join(destination_dir, filename) path = os.path.join(destination_dir, filename)
with open(path, 'wb+') as f: with open(path, 'wb+') as f:
f.write(content) f.write(content)
self.stdout.write("Written WebclientJavaScriptView for realm {} to '{}'".format( self.stdout.write("Written WebclientJavaScriptView for realm {} to '{}'".format(
realm, realm,
path)) path))
return super().collect() return super().collect()

4
openslides/global_settings.py
View File

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