NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'disable-autocomplete'

Browse Source
This commit is contained in:
janeczku 2016-06-17 20:01:53 +02:00
commit bd686ad6ed
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cps/templates/user_edit.html
View File

@ -2,21 +2,21 @@
{% block body %} {% block body %}
<div class="discover"> <div class="discover">
<h1>{{title}}</h1> <h1>{{title}}</h1>
<form role="form" method="POST"> <form role="form" method="POST" autocomplete="off">
{% if g.user and g.user.role_admin() and new_user %} {% if g.user and g.user.role_admin() and new_user %}
<div class="form-group required"> <div class="form-group required">
<label for="nickname">Username</label> <label for="nickname">Username</label>
<input type="text" class="form-control" name="nickname" id="nickname" value="{{ content.nickname if content.nickname != None }}"> <input type="text" class="form-control" name="nickname" id="nickname" value="{{ content.nickname if content.nickname != None }}" autocomplete="off">
</div> </div>
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<label for="email">Email address</label> <label for="email">Email address</label>
<input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" required> <input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" autocomplete="off" required>
</div> </div>
{% if g.user and g.user.role_passwd() or g.user.role_admin()%} {% if g.user and g.user.role_passwd() or g.user.role_admin()%}
<div class="form-group"> <div class="form-group">
<label for="password">Password</label> <label for="password">Password</label>
<input type="password" class="form-control" name="password" id="password" value=""> <input type="password" class="form-control" name="password" id="password" value="" autocomplete="off">
</div> </div>
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">

9
cps/web.py
View File

@ -10,6 +10,7 @@ mimetypes.add_type('application/xhtml+xml','.xhtml')
from flask import Flask, render_template, session, request, Response, redirect, url_for, send_from_directory, make_response, g, flash, abort from flask import Flask, render_template, session, request, Response, redirect, url_for, send_from_directory, make_response, g, flash, abort
from cps import db, config, ub, helper from cps import db, config, ub, helper
import os import os
import errno
from sqlalchemy.sql.expression import func from sqlalchemy.sql.expression import func
from sqlalchemy.sql.expression import false from sqlalchemy.sql.expression import false
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError
@ -504,7 +505,13 @@ def read_book(book_id):
(dirName, fileName) = os.path.split(name) (dirName, fileName) = os.path.split(name)
newDir = os.path.join(book_dir, dirName) newDir = os.path.join(book_dir, dirName)
if not os.path.exists(newDir): if not os.path.exists(newDir):
os.mkdir(newDir) try:
os.makedirs(newDir)
except OSError as exception:
if exception.errno == errno.EEXIST:
pass
else:
raise
if fileName: if fileName:
fd = open(os.path.join(newDir, fileName), "wb") fd = open(os.path.join(newDir, fileName), "wb")
fd.write(zfile.read(name)) fd.write(zfile.read(name))