poprawienie buga usuwania zajetego obrazu
This commit is contained in:
parent
9724dbde18
commit
db70943bf0
2
app.py
2
app.py
@ -133,6 +133,8 @@ def delete(image_id):
|
||||
if db.get_user_bytoken(auth_token) is None:
|
||||
return redirect("/login")
|
||||
|
||||
if db.get_image_allocation_all_id() is not None:
|
||||
return jsonify(message="409")
|
||||
filename = db.get_conf_image_id(image_id)
|
||||
squashfs = os.path.join(app.config['UPLOAD_FOLDER'], filename)
|
||||
pubkey = os.path.join(app.config['UPLOAD_FOLDER'], filename.split(".")[0])
|
||||
|
12
db.py
12
db.py
@ -225,14 +225,8 @@ def get_image_allocation_all():
|
||||
except:
|
||||
return None
|
||||
|
||||
def get_image_allocation(sql, value):
|
||||
connect()
|
||||
with get_cur() as cur:
|
||||
cur.execute(sql, (value,))
|
||||
try:
|
||||
return cur.fetchone()[0]
|
||||
except:
|
||||
return None
|
||||
def get_image_allocation(image_id):
|
||||
return get_one("SELECT id FROM image_allocation WHERE image_id = %s", image_id)
|
||||
|
||||
|
||||
def get_image_allocation_time(token):
|
||||
@ -243,7 +237,7 @@ def get_image_allocation_time(token):
|
||||
|
||||
|
||||
def get_image_allocation_time_id(id):
|
||||
get_one("SELECT last_access_time FROM image_allocation WHERE id = %s", id)
|
||||
return get_one("SELECT last_access_time FROM image_allocation WHERE id = %s", id)
|
||||
|
||||
|
||||
def get_image_allocation_clientip(token):
|
||||
|
@ -75,7 +75,7 @@ form textarea {
|
||||
<label>Nazwa tokenu:</label><br>
|
||||
<input type="text" name="token_name" required><br><br>
|
||||
<label>Długość klucza:</label><br>
|
||||
<input type="number" name="key_length" min="1024" required><br><br>
|
||||
<input type="number" name="key_length" min="1024" value="2048" required><br><br>
|
||||
<label>Adres ip VPN:</label><br>
|
||||
<input type="text" name="ip" required><br><br>
|
||||
<label>Konfiguracja authorized_keys:</label><br>
|
||||
|
Loading…
Reference in New Issue
Block a user