Filter posts by state and label

app.py

@@ -973,7 +973,22 @@ def repository_forum_search(username, repository):

                                
                                
                                
                            
                                
                                    
                                        
                                            973  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            974  
                                                page_length = flask.request.args.get("per_page", default_page_length, type=int)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            975  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        976 -
                                            results = Post.query.filter(Post.repo == repo_data).filter(Post.subject.ilike(f"%{query}%") | Post.message.ilike(f"%{query}%")).order_by(Post.last_updated.desc()).paginate(page=page_number, per_page=page_length)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        976 +
                                            all_posts = Post.query.filter(Post.repo == repo_data)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        977 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        978 +
                                            results = (all_posts
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        979 +
                                                       .filter(Post.subject.ilike(f"%{query}%") | Post.message.ilike(f"%{query}%"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        980 +
                                                       .order_by(Post.last_updated.desc()))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        981 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        982 +
                                            if flask.request.args.get("state"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        983 +
                                                try:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        984 +
                                                    results = results.filter(Post.state == int(flask.request.args.get("state")))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        985 +
                                                except ValueError:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        986 +
                                                    pass         # if state is not an integer, ignore it
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        987 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        988 +
                                            if flask.request.args.get("label"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        989 +
                                                results = results.filter(Post.labels.any(Label.identifier == flask.request.args.get("label")))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        990 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        991 +
                                            results = results.paginate(page=page_number, per_page=page_length)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            992  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            993  
                                                if results.has_next:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            994  
                                                    next_page = results.next_num
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1002,7 +1017,9 @@ def repository_forum_search(username, repository):

                                
                                
                                
                            
                                
                                    
                                        
                                            1017  
                                                    page_length=page_length,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1018  
                                                    next_page=next_page,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1019  
                                                    prev_page=prev_page,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1005 -
                                                num_pages=results.pages
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1020 +
                                                num_pages=results.pages,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1021 +
                                                require_state=flask.request.args.get("state"),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1022 +
                                                require_label=flask.request.args.get("label"),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1023  
                                                )
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1024  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1025  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/repository/repo-forum-search.html

@@ -10,6 +10,17 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            10  
                                                    <x-vbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            11  
                                                        <form class="hbox">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            12  
                                                            <input type="text" name="q" placeholder="{% trans %}Search...{% endtrans %}" value="{{ query }}" aria-label="{% trans %}Search query{% endtrans %}">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        13 +
                                                        <select name="state" aria-label="{% trans %}State{% endtrans %}">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        14 +
                                                            <option value="">{% trans %}all{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        15 +
                                                            <option value="0" {% if require_state == "0" %}selected{% endif %}>{% trans %}done{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        16 +
                                                            <option value="1" {% if require_state == "1" %}selected{% endif %}>{% trans %}active{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 +
                                                        </select>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        18 +
                                                        <select name="label" aria-label="{% trans %}Label{% endtrans %}">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        19 +
                                                            <option value="">{% trans %}all{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        20 +
                                                            {% for label in repo_data.labels %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        21 +
                                                                <option value="{{ label.identifier }}" {% if label.identifier == require_label %}selected{% endif %}>{{ label.name }}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        22 +
                                                            {% endfor %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        23 +
                                                        </select>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            24  
                                                            <button type="submit">{% trans %}Search{% endtrans %}</button>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            25  
                                                        </form>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            26  
                                                        {% for post in results %}