kallithea Changeset - 949d50b31c22

Changeset - 949d50b31c22

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 9 years ago 2016-08-04 14:23:36
madski@unity3d.com

routing: introduce 'notification_update' url and use POST instead of PUT

3 files changed with 5 insertions and 5 deletions:

kallithea/config/routing.py

kallithea/public/js/base.js

kallithea/templates/admin/notifications/notifications.html

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -374,14 +374,14 @@ def make_map(config): @@
         m.connect("notifications", "/notifications",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("notifications_mark_all_read", "/notifications/mark_all_read",
                   action="mark_all_read", conditions=dict(method=["GET"]))
         m.connect("formatted_notifications", "/notifications.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("/notifications/{notification_id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("notification_update", "/notifications/{notification_id}/update",
                   action="update", conditions=dict(method=["POST"]))
         m.connect("notification_delete", "/notifications/{notification_id}/delete",
                   action="delete", conditions=dict(method=["POST"]))
         m.connect("notification", "/notifications/{notification_id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_notification", "/notifications/{notification_id}.{format}",
                   action="show", conditions=dict(method=["GET"]))

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1012,13 +1012,13 @@ var readNotification = function(url, not @@
             $obj.find('.read-notification').remove();
             _run_callbacks(callbacks);
         };
     var failure = function(o){
             alert("readNotification failure");
         };
-    var postData = {'_method': 'put'};
     var postData = {};
     var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
     ajaxPOST(sUrl, postData, success, failure);
 };
 /**
  * Autocomplete functionality

kallithea/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -33,21 +33,21 @@ @@
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
 var url_delete = "${url('notification_delete', notification_id='__NOTIFICATION_ID__')}";
-var url_action = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
+var url_read = "${url('notification_update', notification_id='__NOTIFICATION_ID__')}";
 var run = function(){
   $('.delete-notification').click(function(e){
     var notification_id = e.currentTarget.id;
     deleteNotification(url_delete,notification_id);
   });
   $('.read-notification').click(function(e){
     var notification_id = e.currentTarget.id;
-    readNotification(url_action,notification_id);
+    readNotification(url_read,notification_id);
   });
+}
 run();
 $('#mark_all_read').click(function(){
     var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";
     asynchtml(url, $('#notification_data'), function(){run();});

0 comments (0 inline, 0 general)