Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/controllers/albums.php

1 files changed, 6 insertions, 0 deletions

diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index aaae9e72..52c695c6 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -19,6 +19,7 @@ function ajaxify_tag_form() {
 function closeEditInPlaceForms() {
   // closes currently open inplace edit forms
   if ($("#gRenameTagForm").length) {
+    $("#gEditErrorMessage").remove();
     var li = $("#gRenameTagForm").parent();
     $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
     li.height("");
@@ -66,6 +67,11 @@ function editInPlace(element) {
           $("#gTag-" + data.tag_id).text(data.new_tagname); // update tagname
           console.log(data);
           window.location.reload();
+        } else if (data.result == "error") {
+          $("#gRenameTagForm #name")
+            .addClass("gError")
+            .focus();
+          $("#gTagAdmin").before("<p id=\"gEditErrorMessage\" class=\"gError\">" + data.message + "</p>");
         }
       }
     });