Browse Source

Changed confspec to include Auth specs + em_test modifications

Yann Weber 7 years ago
parent
commit
25a231702e

+ 33
- 0
em_test.py View File

@@ -374,6 +374,39 @@ index_theme_theme = index_abstract.new_field(
374 374
     data_handler = 'varchar',
375 375
     group = index_group)
376 376
 
377
+#############
378
+#   USERS   #
379
+#############
380
+
381
+user_group = em.new_group(
382
+    'users', display_name = 'Lodel users',
383
+    help_text = 'Group that handle users en perm')
384
+
385
+user = em.new_class(
386
+    'user', display_name = 'Lodel user', help_text = 'Represent a lodel user',
387
+    group = user_group, abstract = False)
388
+
389
+user.new_field(
390
+    'id', display_name = 'user identifier', help_text = 'Uniq ID',
391
+    group = user_group, data_handler = 'uniqid', internal = True)
392
+
393
+user.new_field(
394
+    'firstname', display_name = 'Firstname',
395
+    group = user_group, data_handler = 'varchar', internal = False)
396
+
397
+user.new_field(
398
+    'lastname', display_name = 'Lastname',
399
+    group = user_group, data_handler = 'varchar', internal = False)
400
+
401
+user.new_field(
402
+    'login', display_name = 'user login', help_text = 'login',
403
+    group = user_group, data_handler = 'varchar', uniq = True, internal = True)
404
+
405
+user.new_field(
406
+    'password', display_name = 'Password',
407
+    group = user_group, data_handler = 'password', internal = False)
408
+
409
+
377 410
 #em.save('xmlfile', filename = 'examples/em_test.xml')
378 411
 pickle_file = 'examples/em_test.pickle'
379 412
 em.save('picklefile', filename = pickle_file)

BIN
examples/em_test.pickle View File


+ 6
- 1
lodel/settings/validator.py View File

@@ -364,5 +364,10 @@ LODEL2_CONF_SPECS = {
364 364
     },
365 365
     'lodel2.datasources.*': {
366 366
         'read_only': (False, SettingValidator('bool')),
367
-        'identifier': ( None, SettingValidator('string'))}
367
+        'identifier': ( None, SettingValidator('string')),
368
+    },
369
+    'lodel2.auth': {
370
+        'login_classfield': ('user.login', SettingValidator('emfield')),
371
+        'pass_classfield': ('user.password', SettingValidator('emfield')),
372
+    },
368 373
 }

+ 1
- 1
plugins/webui/confspec.py View File

@@ -13,7 +13,7 @@ CONFSPEC = {
13 13
         'uwsgicmd': ('uwsgi_python3', SettingValidator('dummy')),
14 14
     },
15 15
     'lodel2.webui.sessions': {
16
-        'directory': (  '/tmp/lodel2_session',
16
+        'directory': (  '/tmp',
17 17
                         SettingValidator('path')),
18 18
         'expiration': ( 900,
19 19
                         SettingValidator('int')),

+ 1
- 1
plugins/webui/main.py View File

@@ -22,7 +22,7 @@ def uwsgi_fork(hook_name, caller, payload):
22 22
                     addr = Settings.webui.listen_address,
23 23
                     port = Settings.webui.listen_port,
24 24
                     uwsgi= Settings.webui.uwsgicmd)
25
-        if Settings.webui.virtualenv != '':
25
+        if Settings.webui.virtualenv is not None:
26 26
             cmd += " --virtualenv %s" % Settings.webui.virtualenv
27 27
 
28 28
         exit(os.system(cmd))

BIN
tests/editorial_model.pickle View File


Loading…
Cancel
Save