butter/butter-portal
7
0
Fork 0
Code Issues 14 Pull requests Projects Releases Packages Wiki Activity Actions

Make sure is date iso 8601 formatted

Browse source
This commit is contained in:
Ana Custura 2026-04-08 15:05:45 +01:00
parent a6efce359d
commit 7f3cd42c3e
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/forms.py
View file

@ -34,7 +34,7 @@ class Step2Form(FlaskForm):
butterbox_name = StringField(_l('Butterbox Name'), validators=[DataRequired()]) butterbox_name = StringField(_l('Butterbox Name'), validators=[DataRequired()])
butterbox_logo = FileField((_l('Butterbox Logo')), validators=[FileAllowed(['jpg', 'png', 'svg'], _l('Images only!'))]) butterbox_logo = FileField((_l('Butterbox Logo')), validators=[FileAllowed(['jpg', 'png', 'svg'], _l('Images only!'))])
butterbox_hostname = StringField(_l('Butterbox Hostname'), validators=[DataRequired(), Length(1, 64), hostname_check]) butterbox_hostname = StringField(_l('Butterbox Hostname'), validators=[DataRequired(), Length(1, 64), hostname_check])
butterbox_date = DateTimeField(_l('Butterbox Date'), format='%d/%m/%Y, %H:%M:%S') butterbox_date = DateTimeField(_l('Butterbox Date'), format='%Y-%m-%dT%H:%M:%SZ')
submit = SubmitField(_l('Next')) submit = SubmitField(_l('Next'))

2
app/routes.py
View file

@ -269,9 +269,9 @@ def step4():
setting_value = getattr(form, s).data setting_value = getattr(form, s).data
set_setting(s, setting_value) set_setting(s, setting_value)
set_setting('first_setup', "false") set_setting('first_setup', "false")
dump_settings("settings.txt")
run_madmail_installer() run_madmail_installer()
db.session.commit() db.session.commit()
dump_settings("settings.txt")
return redirect(url_for('setup_complete')) return redirect(url_for('setup_complete'))
if get_setting("first_setup") == "true": if get_setting("first_setup") == "true":
return render_template('step4.html', form=form, get_setting=get_setting) return render_template('step4.html', form=form, get_setting=get_setting)

3
app/static/time.js
View file

@ -1,6 +1,7 @@
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
var currentTime = new Date(); var currentTime = new Date();
const $myDatetimeField = document.querySelector('#butterbox_date') const $myDatetimeField = document.querySelector('#butterbox_date')
$myDatetimeField.value = currentTime.toLocaleString(); console.log(currentTime.toISOString().substring(0, 19));
$myDatetimeField.value = currentTime.toISOString().substring(0, 19) + 'Z';
}); });

1
change_manager.py
View file

@ -137,6 +137,7 @@ def check_settings(raspap_installed: bool):
diff_in_minutes = (datetime.now().timestamp() - last_modified)/60 diff_in_minutes = (datetime.now().timestamp() - last_modified)/60
needs_restart = False needs_restart = False
if diff_in_minutes < 1: if diff_in_minutes < 1:
time.sleep(4)
for s in CHANGES_REQUIRING_RESTART: for s in CHANGES_REQUIRING_RESTART:
print(f"Now at setting: {s}") print(f"Now at setting: {s}")
if s == "wifi_password" and raspap_installed: if s == "wifi_password" and raspap_installed: