diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html index 142adfb2..4775af1a 100644 --- a/cps/templates/user_edit.html +++ b/cps/templates/user_edit.html @@ -2,21 +2,21 @@ {% block body %}

{{title}}

-
+ {% if g.user and g.user.role_admin() and new_user %}
- +
{% endif %}
- +
{% if g.user and g.user.role_passwd() or g.user.role_admin()%}
- +
{% endif %}
diff --git a/cps/web.py b/cps/web.py index 85dce9d6..c9b59200 100755 --- a/cps/web.py +++ b/cps/web.py @@ -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 cps import db, config, ub, helper import os +import errno from sqlalchemy.sql.expression import func from sqlalchemy.sql.expression import false from sqlalchemy.exc import IntegrityError @@ -504,7 +505,13 @@ def read_book(book_id): (dirName, fileName) = os.path.split(name) newDir = os.path.join(book_dir, dirName) 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: fd = open(os.path.join(newDir, fileName), "wb") fd.write(zfile.read(name))