allow close of errors that are not checkdups jobs from FE

This commit is contained in:
2021-09-24 12:50:02 +10:00
parent 0f5f21d266
commit 3ee81a66f2
3 changed files with 32 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
from wtforms import SubmitField, StringField, HiddenField, validators, Form
from flask_wtf import FlaskForm
from flask import request, render_template, redirect, send_from_directory
from flask import request, render_template, redirect, send_from_directory, url_for
from main import db, app, ma
from sqlalchemy import Sequence
from sqlalchemy.exc import SQLAlchemyError
@@ -138,7 +138,7 @@ class FileType(db.Model):
name = db.Column(db.String, unique=True, nullable=False )
def __repr__(self):
return "<id: {}, name={}>".format(self.id, self.name )
return f"<id: {self.id}, name={self.name}>"
################################################################################
# Class describing PA_JobManager_Message and in the DB (via sqlalchemy)
@@ -152,8 +152,9 @@ class PA_JobManager_Message(db.Model):
job_id = db.Column(db.Integer, db.ForeignKey('job.id') )
alert = db.Column(db.String)
message = db.Column(db.String)
job = db.relationship ("Job" )
def __repr__(self):
return "<id: {}, job_id: {}, alert: {}, message: {}".format(self.id, self.job_id, self.alert, self.message)
return f"<id: {self.id}, job_id: {self.job_id}, alert: {self.alert}, message: {self.message}, job: {self.job}"
################################################################################
@@ -257,6 +258,16 @@ def GetEntries( OPT ):
entries+=GetEntriesInFlatView( OPT, prefix )
return entries
################################################################################
# /clear_jm_msg -> with a dismissable error (ie. anything not success, that is
# not showing duplicates (so rare errors) - allow them to be dismissed
################################################################################
@app.route("/clear_jm_msg/<id>", methods=["POST"])
@login_required
def clear_jm_msg(id):
ClearJM_Message(id)
return redirect( url_for("main_page") )
################################################################################
# /file_list -> show detailed file list of files from import_path(s)
################################################################################