# HG changeset patch
# User durandn
# Date 1429018746 -7200
# Node ID 64941df9da779339a92df68c8c03266ada2a6f3c
# Parent  a55054e72fe46ef9e7e53df7a4841f9648a2aeec
fixes to rebase conflicts errors

diff -r a55054e72fe4 -r 64941df9da77 src/catedit/static/js/check_tasks.js
--- a/src/catedit/static/js/check_tasks.js	Tue Apr 14 13:01:25 2015 +0200
+++ b/src/catedit/static/js/check_tasks.js	Tue Apr 14 15:39:06 2015 +0200
@@ -13,11 +13,11 @@
     klass = 'alert-success';
   }
   else if(running_tasks_nb === 1) {
-    message = '1 soumission en cour.';
+    message = '1 soumission en cours.';
     klass = 'alert-info';
   }
   else {
-    message =  running_tasks_nb.toString() + ' soumissions en cour.'
+    message =  running_tasks_nb.toString() + ' soumissions en cours.'
     klass = 'alert-info';
   }
 
diff -r a55054e72fe4 -r 64941df9da77 src/catedit/tasks.py
--- a/src/catedit/tasks.py	Tue Apr 14 13:01:25 2015 +0200
+++ b/src/catedit/tasks.py	Tue Apr 14 15:39:06 2015 +0200
@@ -2,9 +2,11 @@
 from catedit.models import CategoryManager
 import catedit.persistence
 import logging
+
 from flask import g, url_for
 import requests
 
+
 logger = logging.getLogger(__name__)
 
 @celery.task
diff -r a55054e72fe4 -r 64941df9da77 src/catedit/views/meta.py
--- a/src/catedit/views/meta.py	Tue Apr 14 13:01:25 2015 +0200
+++ b/src/catedit/views/meta.py	Tue Apr 14 15:39:06 2015 +0200
@@ -18,7 +18,7 @@
 @meta.route('/cache-clear', defaults={'registry_key': None}, methods=["POST"])
 @meta.route('/cache-clear/<string:registry_key>', methods=["POST"])
 def cache_clear_endpoint(registry_key):
-    if not cache_keys:
+    if not registry_key:
         cache.clear()
     else:
         if cache.get(registry_key) is not None:
@@ -38,7 +38,6 @@
     else:
         task_ids_list = task_ids.split(',')
 
-
     res = utils.get_tasks_status(task_ids_list, not task_ids, repository)
 
     return jsonify(**res)