Enable octal and decimal permission settings

This commit is contained in:
Ruud
2012-03-08 00:51:12 +01:00
parent e2675bd28c
commit 9df218d0a8
2 changed files with 9 additions and 5 deletions
+3 -3
View File
@@ -81,13 +81,13 @@ config = [{
}, },
{ {
'name': 'permission_folder', 'name': 'permission_folder',
'default': 0755, 'default': '0755',
'label': 'Folder CHMOD', 'label': 'Folder CHMOD',
'description': 'Permission (decimal) for creating/copying folders. 0755 => 593, 0777 => 511', 'description': 'Can be either decimal (493) or octal (leading zero: 0755)',
}, },
{ {
'name': 'permission_file', 'name': 'permission_file',
'default': 0755, 'default': '0755',
'label': 'File CHMOD', 'label': 'File CHMOD',
'description': 'Same as Folder CHMOD but for files', 'description': 'Same as Folder CHMOD but for files',
}, },
+6 -2
View File
@@ -62,8 +62,12 @@ class Env(object):
return s return s
@staticmethod @staticmethod
def getPermission(type): def getPermission(setting_type):
return int(Env.get('settings').get('permission_%s' % type, default = 0777)) perm = Env.get('settings').get('permission_%s' % setting_type, default = '0777')
if perm[0] == '0':
return oct(int(perm, 8))
else:
return oct(int(perm))
@staticmethod @staticmethod
def fireEvent(*args, **kwargs): def fireEvent(*args, **kwargs):