yannweb
/
lodel2_mirror
mirror of https://github.com/yweber/lodel2.git
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Merge branch 't11' 

Conflicts:
	EditorialModel/fieldtypes.py
Roland Haroutiounian 9 years ago
parent
46a60bdb89 3ff8991f1c
commit
3674f2044c
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1
    1
      EditorialModel/fieldtypes.py

+ 1
- 1
EditorialModel/fieldtypes.py View File

2
2
3 
 from EditorialModel.components import EmComponent, EmComponentNotExistError
 3 
 from EditorialModel.components import EmComponent, EmComponentNotExistError
4 
 from Lodel.utils.mlstring import MlString
 4 
 from Lodel.utils.mlstring import MlString
5 
-from sqlalchemy import Column, INTEGER, BOOLEAN
5 
+from sqlalchemy import Column, INTEGER, BOOLEAN, VARCHAR
6
6
7 
 def get_field_type(name):
 7 
 def get_field_type(name):
8 
     class_name = 'EmField_' + name
 8 
     class_name = 'EmField_' + name

Write Preview
Loading…
Cancel
Save