From 98b914ff36932e52d2ffe9abcd4fad83416dc9f2 Mon Sep 17 00:00:00 2001
From: lisaq <lisa@rhodecode.com>
Date: Thu, 22 Sep 2016 19:54:03 +0200
Subject: [PATCH] notifications: fixing alerts when gist has been edited

---
 rhodecode/templates/admin/gists/edit.html | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/rhodecode/templates/admin/gists/edit.html b/rhodecode/templates/admin/gists/edit.html
index 16b0579a..03c8d5b0 100644
--- a/rhodecode/templates/admin/gists/edit.html
+++ b/rhodecode/templates/admin/gists/edit.html
@@ -24,12 +24,6 @@
     </div>
 
     <div class="table">
-        <div id="edit_error" class="flash_msg" style="display:none;">
-            <div class="alert alert-warning">
-              ${h.literal(_('Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version.')
-                             % {'here': h.link_to('here',h.url('edit_gist', gist_id=c.gist.gist_access_id))})}
-            </div>
-        </div>
 
         <div id="files_data">
           ${h.secure_form(h.url('edit_gist', gist_id=c.gist.gist_access_id), method='post', id='eform')}
@@ -115,7 +109,6 @@
 <script>
   $('#update').on('click', function(e){
       e.preventDefault();
-
       // check for newer version.
       $.ajax({
         url: "${h.url('edit_gist_check_revision', gist_id=c.gist.gist_access_id)}",
@@ -126,8 +119,11 @@
         type: 'GET',
         success: function(data) {
           if(data.success === false){
-              $('#edit_error').show();
-              window.scrollTo(0,0);
+            message = '${h.literal(_('Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version.')
+              % {'here': h.link_to('here',h.url('edit_gist', gist_id=c.gist.gist_access_id))})}'
+            alertMessage = [{"message": {
+              "message": message, "force": "true", "level": "warning"}}];
+            $.Topic('/notifications').publish(alertMessage[0]);
           }
           else{
             $('#eform').submit();