worked on assets bundling, added admin field
This commit is contained in:
parent
0dead5176a
commit
ad401da4f1
8 changed files with 37 additions and 22 deletions
|
@ -38,6 +38,7 @@ def load_token(token):
|
|||
class AnonUser(AnonymousUserMixin):
|
||||
username = 'Anon'
|
||||
email = ''
|
||||
admin = False
|
||||
|
||||
|
||||
class User(Model, UserMixin):
|
||||
|
@ -46,6 +47,7 @@ class User(Model, UserMixin):
|
|||
username = db.Column(db.String, unique=True)
|
||||
email = db.Column(db.String, unique=True)
|
||||
password = db.Column(db.String)
|
||||
admin = False
|
||||
|
||||
hidden_fields = ['password']
|
||||
readonly_fields = ['email', 'password']
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from realms import assets
|
||||
|
||||
assets.register('editor',
|
||||
assets.register('editor.js',
|
||||
'js/ace/ace.js',
|
||||
'js/ace/mode-markdown.js',
|
||||
'vendor/keymaster/keymaster.js',
|
||||
|
|
|
@ -62,7 +62,7 @@ def edit(name):
|
|||
if data:
|
||||
name = remove_ext(data['name'])
|
||||
content = data['data']
|
||||
g.assets.append('editor')
|
||||
g.assets['js'].append('editor.js')
|
||||
return render_template('wiki/edit.html', name=name, content=content)
|
||||
else:
|
||||
return redirect(url_for('wiki.create', name=cname))
|
||||
|
@ -90,7 +90,7 @@ def create(name):
|
|||
# Page exists, edit instead
|
||||
return redirect(url_for('wiki.edit', name=cname))
|
||||
|
||||
g.assets.append('editor')
|
||||
g.assets['js'].append('editor.js')
|
||||
return render_template('wiki/edit.html', name=cname, content="")
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue