[TWiki-Dev] [SVN] HideyoImazu r26569 - in twiki/trunk/AutoSectionsPlugin: lib/TWiki/Plugins pub/TWiki/AutoSectionsPlugin

[<de...@de...>]

Author: HideyoImazu
Date: 2013-10-30 05:45:28 -0500 (Wed, 30 Oct 2013)
New Revision: 26569
Trac url: http://develop.twiki.org/trac/changeset/26569

Modified:
   twiki/trunk/AutoSectionsPlugin/lib/TWiki/Plugins/AutoSectionsPlugin.pm
   twiki/trunk/AutoSectionsPlugin/pub/TWiki/AutoSectionsPlugin/AutoSections.js
Log:
Item7374: Display errors on edit conflicts: modified messages

Modified: twiki/trunk/AutoSectionsPlugin/lib/TWiki/Plugins/AutoSectionsPlugin.pm
===================================================================
--- twiki/trunk/AutoSectionsPlugin/lib/TWiki/Plugins/AutoSectionsPlugin.pm	2013-10-30 08:06:57 UTC (rev 26568)
+++ twiki/trunk/AutoSectionsPlugin/lib/TWiki/Plugins/AutoSectionsPlugin.pm	2013-10-30 10:45:28 UTC (rev 26569)
@@ -271,8 +271,11 @@
                     'autosection',
                     web    => $web,
                     topic  => $topic,
-                    params => ["$user has modified this topic. ".
-                        "Please refresh the page and try again."],
+                    params => [
+                        "$user has modified this topic. " .
+                        "Please refresh the page and try again. " .
+                        "Or edit the entire topic."
+                    ],
                 );
             }
         }

Modified: twiki/trunk/AutoSectionsPlugin/pub/TWiki/AutoSectionsPlugin/AutoSections.js
===================================================================
--- twiki/trunk/AutoSectionsPlugin/pub/TWiki/AutoSectionsPlugin/AutoSections.js	2013-10-30 08:06:57 UTC (rev 26568)
+++ twiki/trunk/AutoSectionsPlugin/pub/TWiki/AutoSectionsPlugin/AutoSections.js	2013-10-30 10:45:28 UTC (rev 26569)
@@ -233,7 +233,7 @@
               if (data.match(/\[AutoSectionsPlugin\](.*?)\[\/AutoSectionsPlugin\]/)) {
                 alert(RegExp.$1);
               } else {
-                alert("Edit conflict: Please edit the whole page instead of a section.");
+                alert("Edit conflict: Please edit the entire topic instead of a section.");
               }
               cancelEditing();
               ajaxLoad = null;