# HG changeset patch # User durandn # Date 1429262610 -7200 # Node ID 04de6a2985273f07721e22c97d38ee42ac077b25 # Parent 7684ea24c3305b15dece16c93628660e409a4e5f fixed routing error for deleting all changes diff -r 7684ea24c330 -r 04de6a298527 src/catedit/__init__.py --- a/src/catedit/__init__.py Fri Apr 17 10:45:30 2015 +0200 +++ b/src/catedit/__init__.py Fri Apr 17 11:23:30 2015 +0200 @@ -77,13 +77,14 @@ Utility hook function to link to every github call as a kwarg so the app logs how many requests can still be made, after the current request """ - app.logger.debug( - str(r.request.method) + " " - + str(r.url) + " - " - + "Remaining requests count: " - + str(r.headers["X-RateLimit-Remaining"]) + "/" - + str(r.headers["X-RateLimit-Limit"]) - ) + pass + #app.logger.debug( + # str(r.request.method) + " " + # + str(r.url) + " - " + # + "Remaining requests count: " + # + str(r.headers["X-RateLimit-Remaining"]) + "/" + # + str(r.headers["X-RateLimit-Limit"]) + #) def save_links(r, *args, **kwargs): """ diff -r 7684ea24c330 -r 04de6a298527 src/catedit/templates/categories/workshop.html --- a/src/catedit/templates/categories/workshop.html Fri Apr 17 10:45:30 2015 +0200 +++ b/src/catedit/templates/categories/workshop.html Fri Apr 17 11:23:30 2015 +0200 @@ -54,7 +54,7 @@ -
+

    diff -r 7684ea24c330 -r 04de6a298527 src/catedit/views/categories.py --- a/src/catedit/views/categories.py Fri Apr 17 10:45:30 2015 +0200 +++ b/src/catedit/views/categories.py Fri Apr 17 11:23:30 2015 +0200 @@ -49,7 +49,7 @@ @module.route( - '//delete-modifs-&redirect_to=', + '//delete-modifs-_redirect_to=', methods=['POST'] ) def delete_changes(repository, deleted_changes_id, redirect_to): @@ -63,18 +63,35 @@ check_user_status_and_repo_access(repository) cat_changes_api_instance = CategoryChangesAPI() - if deleted_changes_id is None: - cat_changes_api_instance.delete(repository=repository) - else: - cat_changes_api_instance.delete( - repository=repository, - modified_cat_id=deleted_changes_id - ) + logger.debug("deleting changes for cat") + cat_changes_api_instance.delete( + repository=repository, + modified_cat_id=deleted_changes_id + ) return redirect(url_for('categories.'+redirect_to, repository=repository)) @module.route( - '//delete-&redirect_to=', + '//delete-all-modifs_redirect_to_', + methods=['POST'] +) +def delete_all_changes(repository, redirect_to): + """ + View that handles deleting changes for a given repo. If no deleted_changes_id is + given, it will delete every change + """ + if repository not in app.config["PERSISTENCE_CONFIG"]["REPOSITORY_LIST"]: + abort(404) + + check_user_status_and_repo_access(repository) + + cat_changes_api_instance = CategoryChangesAPI() + cat_changes_api_instance.delete(repository=repository) + return redirect(url_for('categories.'+redirect_to, repository=repository)) + + +@module.route( + '//delete-category-_redirect_to=', methods=['POST'] ) def delete_category(repository, deleted_cat_id, redirect_to):