Actually delete galleries

app.py

@@ -1093,8 +1093,8 @@ def edit_gallery_post(id):

                                
                                
                                
                            
                                
                                    
                                        
                                            1093  
                                                return flask.redirect("/gallery/" + str(gallery.id))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1094  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1095  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1096 -
                                        @app.route("/gallery/<int:id>/delete", methods=["POST"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1097 -
                                        def edit_gallery_post(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1096 +
                                        @app.route("/gallery/<int:id>/delete")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1097 +
                                        def delete_gallery(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1098  
                                                gallery = db.session.get(Gallery, id)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1099  
                                                if gallery is None:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1100  
                                                    flask.abort(404)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1106,6 +1106,8 @@ def edit_gallery_post(id):

                                
                                
                                
                            
                                
                                    
                                        
                                            1106  
                                                if current_user != gallery.owner and not current_user.admin:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1107  
                                                    flask.abort(403)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1108  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1109 +
                                            PictureInGallery.query.filter_by(gallery=gallery).delete()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1110 +
                                            UserInGallery.query.filter_by(gallery=gallery).delete()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1111  
                                                db.session.delete(gallery)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1112  
                                                db.session.commit()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1113  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1881,12 +1883,8 @@ def api_delete_gallery(id):

                                
                                
                                
                            
                                
                                    
                                        
                                            1883  
                                                if current_user != gallery.owner and not current_user.admin:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1884  
                                                    flask.abort(403)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1885  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1884 -
                                            for picture_in_gallery in gallery.pictures:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1885 -
                                                db.session.delete(picture_in_gallery)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1886 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1887 -
                                            for user_in_gallery in gallery.users:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1888 -
                                                db.session.delete(user_in_gallery)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1889 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1886 +
                                            PictureInGallery.query.filter_by(gallery=gallery).delete()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1887 +
                                            UserInGallery.query.filter_by(gallery=gallery).delete()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1888  
                                                db.session.delete(gallery)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1889  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1890  
                                                db.session.commit()