Adding and removing labels from posts

app.py

@@ -1250,6 +1250,80 @@ def repository_forum_vote(username, repository, post_id, score):

                                
                                
                                
                            
                                
                                    
                                        
                                            1250  
                                                return response
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1251  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1252  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1253 +
                                        @repositories.route("/<username>/<repository>/forum/<int:post_id>/label", methods=["POST"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1254 +
                                        def repository_forum_label(username, repository, post_id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1255 +
                                            server_repo_location = os.path.join(config.REPOS_PATH, username, repository)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1256 +
                                            if not os.path.exists(server_repo_location):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1257 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1258 +
                                            if not get_permission_level(flask.session.get("username"), username, repository):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1259 +
                                                flask.abort(403)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1260 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1261 +
                                            repo = git.Repo(server_repo_location)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1262 +
                                            repo_data = Repo.query.filter_by(route=f"/{username}/{repository}").first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1263 +
                                            user = User.query.filter_by(username=flask.session.get("username")).first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1264 +
                                            relationships = RepoAccess.query.filter_by(repo=repo_data)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1265 +
                                            user_relationship = RepoAccess.query.filter_by(repo=repo_data, user=user).first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1266 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1267 +
                                            post = Post.query.filter_by(identifier=f"/{username}/{repository}/{post_id}").first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1268 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1269 +
                                            if not post:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1270 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1271 +
                                            if post.parent:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1272 +
                                                flask.abort(400)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1273 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1274 +
                                            label = db.session.get(Label, flask.request.form["label"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1275 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1276 +
                                            if PostLabel.query.filter_by(post=post, label=label).first():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1277 +
                                                return flask.redirect(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1278 +
                                                    flask.url_for(".repository_forum_thread", username=username, repository=repository,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1279 +
                                                                  post_id=post_id),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1280 +
                                                    code=303)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1281 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1282 +
                                            post_label = PostLabel(post, label)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1283 +
                                            db.session.add(post_label)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1284 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1285 +
                                            db.session.commit()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1286 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1287 +
                                            return flask.redirect(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1288 +
                                                    flask.url_for(".repository_forum_thread", username=username, repository=repository,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1289 +
                                                                      post_id=post_id),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1290 +
                                                    code=303)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1291 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1292 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1293 +
                                        @repositories.route("/<username>/<repository>/forum/<int:post_id>/remove-label")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1294 +
                                        def repository_forum_remove_label(username, repository, post_id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1295 +
                                            server_repo_location = os.path.join(config.REPOS_PATH, username, repository)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1296 +
                                            if not os.path.exists(server_repo_location):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1297 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1298 +
                                            if not get_permission_level(flask.session.get("username"), username, repository):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1299 +
                                                flask.abort(403)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1300 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1301 +
                                            repo = git.Repo(server_repo_location)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1302 +
                                            repo_data = Repo.query.filter_by(route=f"/{username}/{repository}").first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1303 +
                                            user = User.query.filter_by(username=flask.session.get("username")).first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1304 +
                                            relationships = RepoAccess.query.filter_by(repo=repo_data)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1305 +
                                            user_relationship = RepoAccess.query.filter_by(repo=repo_data, user=user).first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1306 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1307 +
                                            post = Post.query.filter_by(identifier=f"/{username}/{repository}/{post_id}").first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1308 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1309 +
                                            if not post:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1310 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1311 +
                                            if post.parent:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1312 +
                                                flask.abort(400)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1313 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1314 +
                                            label = db.session.get(Label, flask.request.args["label"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1315 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1316 +
                                            post_label = PostLabel.query.filter_by(post=post, label=label).first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1317 +
                                            db.session.delete(post_label)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1318 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1319 +
                                            db.session.commit()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1320 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1321 +
                                            return flask.redirect(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1322 +
                                                    flask.url_for(".repository_forum_thread", username=username, repository=repository,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1323 +
                                                                      post_id=post_id),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1324 +
                                                    code=303)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1325 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1326 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1327  
                                            @repositories.route("/<username>/<repository>/favourite")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1328  
                                            def repository_favourite(username, repository):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1329  
                                                server_repo_location = os.path.join(config.REPOS_PATH, username, repository)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

models.py

@@ -273,7 +273,7 @@ with (app.app_context()):

                                
                                
                                
                            
                                
                                    
                                        
                                            273  
                                                class PostLabel(db.Model):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            274  
                                                    id = db.Column(db.Integer, primary_key=True)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            275  
                                                    post_identifier = db.Column(db.String(109), db.ForeignKey("post.identifier"), nullable=False)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        276 -
                                                label_identifier = db.Column(db.String(64), db.ForeignKey("label.identifier"), nullable=False)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        276 +
                                                label_identifier = db.Column(db.String(162), db.ForeignKey("label.identifier"), nullable=False)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            277  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            278  
                                                    post = db.relationship("Post", back_populates="labels")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            279  
                                                    label = db.relationship("Label", back_populates="posts")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/post.html

@@ -6,6 +6,9 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                                            {% if level %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                                                <h2><a href="{{ post.number }}">{{ post.subject }}</a> <span class="post-number">#{{ post.number }}</span></h2>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            8  
                                                            {% else %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        9 +
                                                            <h2>{{ post.subject }} <span class="post-number">#{{ post.number }}</span></h2>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        10 +
                                                        {% endif %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        11 +
                                                        {% if not post.parent %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            12  
                                                                <dialog id="add-label">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            13  
                                                                    <article class="card">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            14  
                                                                        <section class="card-main">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -16,7 +19,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            19  
                                                                                        {% trans %}Label to add:{% endtrans %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            20  
                                                                                        <select name="label">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            21  
                                                                                            {% for label in repo_data.labels %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        19 -
                                                                                            <option value="{{ label }}">{{ label }}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        22 +
                                                                                            <option value="{{ label.identifier }}">{{ label.name }}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            23  
                                                                                            {% endfor %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            24  
                                                                                        </select>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            25  
                                                                                    </label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -29,14 +32,16 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            32  
                                                                        </section>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            33  
                                                                    </article>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            34  
                                                                </dialog>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        32 -
                                                            <h2>{{ post.subject }} <span class="post-number">#{{ post.number }}</span></h2>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        33 -
                                                            <x-hbox class="post-labels">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        35 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        36 +
                                                            <x-hbox class="post-labels box-center">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            37  
                                                                    {% for label in post.labels %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        35 -
                                                                    <a href="/label/{{ label }}">{{ label }}</a>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        38 +
                                                                    <a href="{{ post.number }}/remove-label?label={{ label.label.identifier }}" class="post-label {% if get_permission_level(logged_in_user, username, repository) >= 1 %}removable{% endif %}" style="background-color: {{ label.label.colour_hex }};">{{ label.label.name }}</a>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            39  
                                                                    {% endfor %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        37 -
                                                                <button id="add-label-button" class="button-flat" onclick="document.getElementById('add-label').showModal();">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        38 -
                                                                    <iconify-icon icon="mdi:plus"></iconify-icon>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        39 -
                                                                </button>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        40 +
                                                                {% if get_permission_level(logged_in_user, username, repository) >= 1 %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 +
                                                                    <button class="button-flat" onclick="document.getElementById('add-label').showModal();" title="{% trans %}Add a label{% endtrans %}">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        42 +
                                                                        <iconify-icon icon="mdi:plus"></iconify-icon>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        43 +
                                                                    </button>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        44 +
                                                                {% endif %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            45  
                                                                </x-hbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            46  
                                                            {% endif %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            47  
                                                            <p>