mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	Add Contributions Mockup and fix email notifications on job status change
This commit is contained in:
		@@ -57,8 +57,8 @@ def create_app(config: Config = Config) -> Flask:
 | 
			
		||||
    from .auth import bp as auth_blueprint
 | 
			
		||||
    app.register_blueprint(auth_blueprint, url_prefix='/auth')
 | 
			
		||||
 | 
			
		||||
    from .contribute import bp as contribute_blueprint
 | 
			
		||||
    app.register_blueprint(contribute_blueprint, url_prefix='/contribute')
 | 
			
		||||
    from .contributions import bp as contributions_blueprint
 | 
			
		||||
    app.register_blueprint(contributions_blueprint, url_prefix='/contributions')
 | 
			
		||||
 | 
			
		||||
    from .corpora import bp as corpora_blueprint
 | 
			
		||||
    app.register_blueprint(corpora_blueprint, url_prefix='/corpora')
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
from flask import Blueprint
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
bp = Blueprint('contribute', __name__)
 | 
			
		||||
bp = Blueprint('contributions', __name__)
 | 
			
		||||
from . import routes
 | 
			
		||||
							
								
								
									
										15
									
								
								app/contributions/forms.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								app/contributions/forms.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,15 @@
 | 
			
		||||
from app.models import User
 | 
			
		||||
from flask_wtf import FlaskForm
 | 
			
		||||
from wtforms import (
 | 
			
		||||
    BooleanField,
 | 
			
		||||
    PasswordField,
 | 
			
		||||
    StringField,
 | 
			
		||||
    SubmitField,
 | 
			
		||||
    ValidationError
 | 
			
		||||
)
 | 
			
		||||
from wtforms.validators import DataRequired, InputRequired, Email, EqualTo, Length, Regexp
 | 
			
		||||
from . import USERNAME_REGEX
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ContributeTesseractOCRModel(FlaskForm):
 | 
			
		||||
    pass
 | 
			
		||||
@@ -1,3 +1,4 @@
 | 
			
		||||
from ast import Pass
 | 
			
		||||
from app import db
 | 
			
		||||
from app.decorators import permission_required
 | 
			
		||||
from app.models import Permission, Role, User
 | 
			
		||||
@@ -14,6 +15,11 @@ def before_request():
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@bp.route('/')
 | 
			
		||||
@bp.route('')
 | 
			
		||||
def index():
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@bp.route('/tesseract_ocr_model', methods=['GET', 'POST'])
 | 
			
		||||
def tesseract_ocr_model():
 | 
			
		||||
    pass
 | 
			
		||||
@@ -1088,6 +1088,8 @@ def job_after_update_handler(mapper, connection, job):
 | 
			
		||||
    for attr in db.inspect(job).attrs:
 | 
			
		||||
        if attr.key != 'status':
 | 
			
		||||
            continue
 | 
			
		||||
        if not attr.load_history().has_changes():
 | 
			
		||||
            return
 | 
			
		||||
        if job.user.setting_job_status_mail_notification_level == UserSettingJobStatusMailNotificationLevel.NONE:
 | 
			
		||||
            return
 | 
			
		||||
        if job.user.setting_job_status_mail_notification_level == UserSettingJobStatusMailNotificationLevel.END:
 | 
			
		||||
 
 | 
			
		||||
@@ -32,7 +32,7 @@
 | 
			
		||||
  <li><a href="{{ url_for('admin.index') }}"><i class="material-icons">admin_panel_settings</i>Administration</a></li>
 | 
			
		||||
  {% endif %}
 | 
			
		||||
  {% if current_user.can(Permission.CONTRIBUTE) %}
 | 
			
		||||
  <li><a href="{{ url_for('contribute.index') }}"><i class="material-icons">new_label</i>Contribute</a></li>
 | 
			
		||||
  <li><a href="{{ url_for('contributions.index') }}"><i class="material-icons">new_label</i>Contribute</a></li>
 | 
			
		||||
  {% endif %}
 | 
			
		||||
  {% if current_user.can(Permission.USE_API) %}
 | 
			
		||||
  <li><a href="{{ url_for('api.doc') }}"><i class="material-icons">api</i>API</a></li>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user