Mercurial Mercurial > jocondelab / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better error management when editing wikipedia.
authorymh <ymh.work@gmail.com>
Mon, 29 Jul 2013 22:55:07 +0200
changeset 80 3851909cb730
parent 79 c7de7a56164d
child 81 e78e5a2017b6
better error management when editing wikipedia. Correct the javascript when there is an error and correct the behaviour of the code when a null result is returned. (done when investigating bug #17630)
src/core/wp_utils.py file | annotate | diff | comparison | revisions
src/jocondelab/locale/en/LC_MESSAGES/djangojs.mo file | annotate | diff | comparison | revisions
src/jocondelab/locale/en/LC_MESSAGES/djangojs.po file | annotate | diff | comparison | revisions
src/jocondelab/locale/fr/LC_MESSAGES/djangojs.mo file | annotate | diff | comparison | revisions
src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po file | annotate | diff | comparison | revisions
src/jocondelab/static/jocondelab/js/jocondelab.js file | annotate | diff | comparison | revisions 
--- a/src/core/wp_utils.py	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/core/wp_utils.py	Mon Jul 29 22:55:07 2013 +0200
@@ -192,7 +192,7 @@
     new_label = wp_res['new_label']
     alternative_label= wp_res['alternative_label']
     status =  wp_res['status']
-    url = wp_res['wikipedia_url'] + ("#"+fragment if label_is_url else "")    
+    url = wp_res['wikipedia_url'] + ("#"+fragment if label_is_url else "") if wp_res['wikipedia_url'] else None    
     alternative_url = wp_res['alternative_wikipedia_url']
     pageid = wp_res['pageid']
     alternative_pageid = wp_res['alternative_pageid']
Binary file src/jocondelab/locale/en/LC_MESSAGES/djangojs.mo has changed
--- a/src/jocondelab/locale/en/LC_MESSAGES/djangojs.po	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/jocondelab/locale/en/LC_MESSAGES/djangojs.po	Mon Jul 29 22:55:07 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-18 10:33+0200\n"
+"POT-Creation-Date: 2013-07-29 22:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,18 +30,22 @@
 msgstr ""
 "Do you confirm the deletion of the wikipedia link for the term \"%s\" ?"
 
-#: static/jocondelab/js/jocondelab.js:192
+#: static/jocondelab/js/jocondelab.js:211
 msgid "Confirmez-vous la validation de ce terme ?"
 msgstr "Do you confirm this term validation ?"
 
-#: static/jocondelab/js/jocondelab.js:195
+#: static/jocondelab/js/jocondelab.js:214
 msgid "Confirmez-vous l'invalidation de cette fiche ?"
 msgstr "Do you confirm this notice validation ?"
 
-#: static/jocondelab/js/jocondelab.js:326
+#: static/jocondelab/js/jocondelab.js:272
+msgid "error when treating request"
+msgstr "error when treating request"
+
+#: static/jocondelab/js/jocondelab.js:341
 msgid "Ok"
 msgstr "Ok"
 
-#: static/jocondelab/js/jocondelab.js:339
+#: static/jocondelab/js/jocondelab.js:354
 msgid "Cancel"
 msgstr "Cancel"
Binary file src/jocondelab/locale/fr/LC_MESSAGES/djangojs.mo has changed
--- a/src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po	Mon Jul 29 22:55:07 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-18 10:33+0200\n"
+"POT-Creation-Date: 2013-07-29 22:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,18 +30,22 @@
 msgid "Confirmez-vous la suppression du lien Wikipédia pour le terme \"%s\" ?"
 msgstr "Confirmez-vous la suppression du lien Wikipédia pour le terme \"%s\" ?"
 
-#: static/jocondelab/js/jocondelab.js:192
+#: static/jocondelab/js/jocondelab.js:211
 msgid "Confirmez-vous la validation de ce terme ?"
 msgstr "Confirmez-vous la validation de ce terme ?"
 
-#: static/jocondelab/js/jocondelab.js:195
+#: static/jocondelab/js/jocondelab.js:214
 msgid "Confirmez-vous l'invalidation de cette fiche ?"
 msgstr "Confirmez-vous la validation de cette fiche ?"
 
-#: static/jocondelab/js/jocondelab.js:326
+#: static/jocondelab/js/jocondelab.js:272
+msgid "error when treating request"
+msgstr "Erreur lors du traitement de la requête"
+
+#: static/jocondelab/js/jocondelab.js:341
 msgid "Ok"
 msgstr "Ok"
 
-#: static/jocondelab/js/jocondelab.js:339
+#: static/jocondelab/js/jocondelab.js:354
 msgid "Cancel"
 msgstr "Annuler"
--- a/src/jocondelab/static/jocondelab/js/jocondelab.js	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/jocondelab.js	Mon Jul 29 22:55:07 2013 +0200
@@ -266,15 +266,10 @@
             window.location.reload(true);
         },
         error: function(jqXHR, textStatus, errorThrown) {
-			resp = $.parseJSON(jqXHR.responseText);
-			console.log(resp.message);
-        },
-        complete: function(){
-            // We empty the input and hide the ok button
             $("#wp_search").val("");
             $("#wp_lang").val(wp_lang);
-            $("#ok_search").html("<b>OK</b>");
-        }
+			$("#ok_search").html("<em style='color: red'>"+gettext("error when treating request")+"</em>").delay(5000).hide(400,function() {$(this).html("<b>OK</b>").show();});
+        },
     });
 }
jocondelab