diff --git a/db_schema.sql b/db_schema.sql index 452a4ed1e2fa8178fc9794c7a25e14648f074918..5496ae135ae94978890b0be2c467403b622ad265 100644 --- a/db_schema.sql +++ b/db_schema.sql @@ -185,8 +185,8 @@ CREATE TABLE IF NOT EXISTS `videos_data` ( ); CREATE TABLE IF NOT EXISTS `announcements` ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - `text` text NOT NULL, - `internal` text NOT NULL, + `text` text NOT NULL DEFAULT "Neue Ankündigung", + `internal` text NOT NULL DEFAULT "", `level` INTEGER NOT NULL DEFAULT 0, `visible` INTEGER NOT NULL DEFAULT 0, `deleted` INTEGER NOT NULL DEFAULT 0, diff --git a/server.py b/server.py index 1acfce89d7f209aca3ead0dbc915ca7387b2effd..769228a1bc393d8cbdce2613e35d79b031f8cc08 100755 --- a/server.py +++ b/server.py @@ -398,15 +398,6 @@ def suggest_chapter(lectureid): return redirect(request.values['ref']) return 'OK', 200 -@app.route('/newpsa', methods=['POST', 'GET']) -@mod_required -def new_announcement(): - id = modify('INSERT INTO announcements (text, internal, time_created, time_updated, created_by) VALUES ("Neue Ankündigung", "", ?, ?, ?)', - datetime.now(), datetime.now(), session.get('user', {'dbid':None})['dbid']) - if 'ref' in request.values: - return redirect(request.values['ref']) - return id, 200 - @app.route('/newfeatured', methods=['POST', 'GET']) @mod_required def new_featured(): diff --git a/templates/index.html b/templates/index.html index 15609d80fd5845e9b31e0b9264624a4c5baabef6..51f74e1f3c12c93fd67ee2bc26e6ee71fd82ce92 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,7 +8,7 @@ <ul class="list-inline pull-right"> {% if ismod() %} <li style="padding-right: 0px;"> - <a class="btn btn-default" href="{{ url_for('new_announcement', ref=request.url) }}">Neue Ankündigung</a> + <a class="btn btn-default" href="{{ url_for('create', table='announcements', ref=request.url) }}">Neue Ankündigung</a> </li> {% endif %} </ul>