3rd
This commit is contained in:
@@ -265,12 +265,17 @@ def activate_spec(spec_id):
|
||||
db.session.add(new_upload)
|
||||
|
||||
spec.status = 'active'
|
||||
|
||||
# 儲存通知郵件清單到資料庫
|
||||
recipients_str = request.form.get('recipients')
|
||||
if recipients_str:
|
||||
spec.notification_emails = recipients_str.strip()
|
||||
|
||||
add_history_log(spec.id, '啟用', f"上傳已簽核檔案 '{filename}'")
|
||||
db.session.commit()
|
||||
flash(f"規範 '{spec.spec_code}' 已生效!", 'success')
|
||||
|
||||
# --- Start of Dynamic Email Notification ---
|
||||
recipients_str = request.form.get('recipients')
|
||||
if recipients_str:
|
||||
recipients = process_recipients(recipients_str)
|
||||
if recipients:
|
||||
@@ -312,7 +317,10 @@ def terminate_spec(spec_id):
|
||||
add_history_log(spec.id, '終止', f"原因: {reason}")
|
||||
|
||||
# --- Start of Dynamic Email Notification ---
|
||||
# 優先使用表單提交的收件者,如果沒有則使用資料庫中儲存的
|
||||
recipients_str = request.form.get('recipients')
|
||||
if not recipients_str and spec.notification_emails:
|
||||
recipients_str = spec.notification_emails
|
||||
if recipients_str:
|
||||
recipients = process_recipients(recipients_str)
|
||||
if recipients:
|
||||
@@ -338,7 +346,8 @@ def terminate_spec(spec_id):
|
||||
flash(f"規範 '{spec.spec_code}' 已被提早終止。", 'warning')
|
||||
return redirect(url_for('temp_spec.spec_list'))
|
||||
|
||||
return render_template('terminate_spec.html', spec=spec)
|
||||
# 將儲存的郵件清單傳遞給模板
|
||||
return render_template('terminate_spec.html', spec=spec, saved_emails=spec.notification_emails)
|
||||
|
||||
@temp_spec_bp.route('/download_initial_word/<int:spec_id>')
|
||||
@login_required
|
||||
@@ -408,7 +417,14 @@ def extend_spec(spec_id):
|
||||
add_history_log(spec.id, '展延', details)
|
||||
|
||||
# --- Start of Dynamic Email Notification ---
|
||||
# 優先使用表單提交的收件者,如果沒有則使用資料庫中儲存的
|
||||
recipients_str = request.form.get('recipients')
|
||||
if not recipients_str and spec.notification_emails:
|
||||
recipients_str = spec.notification_emails
|
||||
|
||||
# 如果使用者有更新郵件清單,儲存回資料庫
|
||||
if recipients_str:
|
||||
spec.notification_emails = recipients_str.strip()
|
||||
if recipients_str:
|
||||
recipients = process_recipients(recipients_str)
|
||||
if recipients:
|
||||
@@ -434,7 +450,8 @@ def extend_spec(spec_id):
|
||||
return redirect(url_for('temp_spec.spec_list'))
|
||||
|
||||
default_new_end_date = spec.end_date + timedelta(days=30)
|
||||
return render_template('extend_spec.html', spec=spec, default_new_end_date=default_new_end_date)
|
||||
# 將儲存的郵件清單傳遞給模板
|
||||
return render_template('extend_spec.html', spec=spec, default_new_end_date=default_new_end_date, saved_emails=spec.notification_emails)
|
||||
|
||||
@temp_spec_bp.route('/history/<int:spec_id>')
|
||||
@login_required # 補上登入驗證
|
||||
|
Reference in New Issue
Block a user