kallithea Changeset - d2ce61e4363d

Changeset - d2ce61e4363d

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

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

routing: introduce 'notification_delete' url and use POST instead of DELETE

5 files changed with 8 insertions and 7 deletions:

kallithea/config/routing.py

kallithea/public/js/base.js

kallithea/templates/admin/notifications/notifications.html

kallithea/templates/admin/notifications/show_notification.html

kallithea/tests/functional/test_admin_notifications.py

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -376,14 +376,14 @@ def make_map(config): @@
         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("/notifications/{notification_id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         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"]))
     #ADMIN GIST

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -997,13 +997,13 @@ var deleteNotification = function(url, n @@
             $("#notification_"+notification_id).remove();
             _run_callbacks(callbacks);
         };
     var failure = function(o){
             alert("deleteNotification failure");
         };
-    var postData = {'_method': 'delete'};
     var postData = {};
     var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
     ajaxPOST(sUrl, postData, success, failure);
 };
 var readNotification = function(url, notification_id, callbacks){
     var success = function(o){

kallithea/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -32,17 +32,18 @@ @@
       %endif
   <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 run = function(){
   $('.delete-notification').click(function(e){
     var notification_id = e.currentTarget.id;
-    deleteNotification(url_action,notification_id);
+    deleteNotification(url_delete,notification_id);
   });
   $('.read-notification').click(function(e){
     var notification_id = e.currentTarget.id;
     readNotification(url_action,notification_id);
   });
+}

kallithea/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ @@
         %endif
         </div>
       </div>
     </div>
 </div>
 <script type="text/javascript">
-var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
+var url = "${url('notification_delete', notification_id='__NOTIFICATION_ID__')}";
 var main = "${url('notifications')}";
    $('.delete-notification').click(function(e){
        var notification_id = e.currentTarget.id;
        deleteNotification(url,notification_id,[function(){window.location=main}]);
    });
 </script>

kallithea/tests/functional/test_admin_notifications.py

➞

Show inline comments

@@ @@ -58,14 +58,14 @@ class TestNotificationsController(TestCo @@
         assert get_notif(cur_user.notifications) == [notification]
         assert get_notif(u1.notifications) == [notification]
         assert get_notif(u2.notifications) == [notification]
         cur_usr_id = cur_user.user_id
         response = self.app.post(
             url('notification', notification_id=notification.notification_id),
             params={'_method': 'delete', '_authentication_token': self.authentication_token()})
             url('notification_delete', notification_id=notification.notification_id),
             params={'_authentication_token': self.authentication_token()})
         assert response.body == 'ok'
         cur_user = User.get(cur_usr_id)
         assert cur_user.notifications == []
     def test_show(self, create_test_user):

0 comments (0 inline, 0 general)