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
2
2
kallithea/public/js/base.js
1
1
kallithea/templates/admin/notifications/notifications.html
2
1
kallithea/templates/admin/notifications/show_notification.html
1
1
kallithea/tests/functional/test_admin_notifications.py
2
2
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -358,50 +358,50 @@ def make_map(config):
 
                  action="my_account_emails", conditions=dict(method=["GET"]))
 
        m.connect("my_account_emails", "/my_account/emails",
 
                  action="my_account_emails_add", conditions=dict(method=["POST"]))
 
        m.connect("my_account_emails", "/my_account/emails",
 
                  action="my_account_emails_delete", conditions=dict(method=["DELETE"]))
 

			




	
	
	
		
 
        m.connect("my_account_api_keys", "/my_account/api_keys",

			




	
	
	
		
 
                  action="my_account_api_keys", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("my_account_api_keys", "/my_account/api_keys",

			




	
	
	
		
 
                  action="my_account_api_keys_add", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("my_account_api_keys", "/my_account/api_keys",

			




	
	
	
		
 
                  action="my_account_api_keys_delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 

			




	
	
	
		
 
    #NOTIFICATION REST ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/notifications') as m:

			




	
	
	
		
 
        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("/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

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/gists') as m:

			




	
	
	
		
 
        m.connect("gists", "/gists",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("gists", "/gists",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_gist", "/gists/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("/gists/{gist_id}",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 
        m.connect("edit_gist", "/gists/{gist_id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET", "POST"]))

			




	
	
	
		
 
        m.connect("edit_gist_check_revision", "/gists/{gist_id}/edit/check_revision",

			




	
	
	
		
 
                  action="check_revision", conditions=dict(method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/public/js/base.js
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -979,49 +979,49 @@ var getSelectionLink = function(e) {

			




	
	
	
		
 
            } else {

			




	
	
	
		
 
                $hl_div = $('<div id="linktt" class="hl-tip-box">');

			




	
	
	
		
 
                $('body').prepend($hl_div);

			




	
	
	
		
 
            }

			




	
	
	
		
 

			




	
	
	
		
 
            $hl_div.append($('<a>').html(_TM['Selection Link']).prop('href', location.href.substring(0, location.href.indexOf('#')) + '#L' + ranges[0] + '-'+ranges[1]));

			




	
	
	
		
 
            var xy = $(till).offset();

			




	
	
	
		
 
            $hl_div.css('top', (xy.top + yoffset) + 'px').css('left', xy.left + 'px');

			




	
	
	
		
 
            $hl_div.show();

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else{

			




	
	
	
		
 
            $hl_div.hide();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var deleteNotification = function(url, notification_id, callbacks){

			




	
	
	
		
 
    var success = function(o){

			




	
	
	
		
 
            $("#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){

			




	
	
	
		
 
            var $obj = $("#notification_"+notification_id);

			




	
	
	
		
 
            $obj.removeClass('unread');

			




	
	
	
		
 
            $obj.find('.read-notification').remove();

			




	
	
	
		
 
            _run_callbacks(callbacks);

			




	
	
	
		
 
        };

			




	
	
	
		
 
    var failure = function(o){

			




	
	
	
		
 
            alert("readNotification failure");

			




	
	
	
		
 
        };

			




	
	
	
		
 
    var postData = {'_method': 'put'};

			




	
	
	
		
 
    var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);

			




	
	
	
		
 
    ajaxPOST(sUrl, postData, success, failure);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Autocomplete functionality

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
// Custom search function for the DataSource of users

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/notifications.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,45 +14,46 @@

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
      <div style="padding:14px 18px;text-align: right;float:left">

			




	
	
	
		
 
      <span id='all' class="btn btn-small"><a href="${h.url.current()}">${_('All')}</a></span>

			




	
	
	
		
 
      <span id='comment' class="btn btn-small"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>

			




	
	
	
		
 
      <span id='pull_request' class="btn btn-small"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %if c.notifications:

			




	
	
	
		
 
      <div style="padding:14px 18px;text-align: right;float:right">

			




	
	
	
		
 
      <span id='mark_all_read' class="btn btn-small">${_('Mark All Read')}</span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %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);

			




	
	
	
		
 
  });

			




	
	
	
		
 
}

			




	
	
	
		
 
run();

			




	
	
	
		
 
$('#mark_all_read').click(function(){

			




	
	
	
		
 
    var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";

			




	
	
	
		
 
    asynchtml(url, $('#notification_data'), function(){run();});

			




	
	
	
		
 
});

			




	
	
	
		
 

			




	
	
	
		
 
var current_filter = "${c.current_filter}";

			




	
	
	
		
 
$('#'+current_filter).addClass('active');

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/show_notification.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,32 +21,32 @@

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
      <div id="notification_${c.notification.notification_id}">

			




	
	
	
		
 
        <div class="notification-header">

			




	
	
	
		
 
          ${h.gravatar_div(c.notification.created_by_user.email, size=24)}

			




	
	
	
		
 
          <div class="desc">

			




	
	
	
		
 
              ${c.notification.description}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="delete-notifications">

			




	
	
	
		
 
            <span id="${c.notification.notification_id}" class="delete-notification action"><i class="icon-minus-circled" id="yui-gen24"></i></span>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="notification-body">

			




	
	
	
		
 
        <div class="notification-subject">${h.literal(c.notification.subject)}</div>

			




	
	
	
		
 
        %if c.notification.body:

			




	
	
	
		
 
            ${h.render_w_mentions(c.notification.body)}

			




	
	
	
		
 
        %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>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_admin_notifications.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -40,50 +40,50 @@ class TestNotificationsController(TestCo

			




	
	
	
		
 
                                   firstname=u'u1', lastname=u'u1',

			




	
	
	
		
 
                                   active=True))

			




	
	
	
		
 
        u2 = create_test_user(dict(username='u2', password='qweqwe',

			




	
	
	
		
 
                                   email='u2@example.com',

			




	
	
	
		
 
                                   firstname=u'u2', lastname=u'u2',

			




	
	
	
		
 
                                   active=True))

			




	
	
	
		
 

			




	
	
	
		
 
        # make notifications

			




	
	
	
		
 
        notification = NotificationModel().create(created_by=cur_user,

			




	
	
	
		
 
                                                  subject=u'test',

			




	
	
	
		
 
                                                  body=u'hi there',

			




	
	
	
		
 
                                                  recipients=[cur_user, u1, u2])

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        u1 = User.get(u1.user_id)

			




	
	
	
		
 
        u2 = User.get(u2.user_id)

			




	
	
	
		
 

			




	
	
	
		
 
        # check DB

			




	
	
	
		
 
        get_notif = lambda un: [x.notification for x in un]

			




	
	
	
		
 
        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):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        cur_user = self._get_logged_user()

			




	
	
	
		
 
        u1 = create_test_user(dict(username='u1', password='qweqwe',

			




	
	
	
		
 
                                   email='u1@example.com',

			




	
	
	
		
 
                                   firstname=u'u1', lastname=u'u1',

			




	
	
	
		
 
                                   active=True))

			




	
	
	
		
 
        u2 = create_test_user(dict(username='u2', password='qweqwe',

			




	
	
	
		
 
                                   email='u2@example.com',

			




	
	
	
		
 
                                   firstname=u'u2', lastname=u'u2',

			




	
	
	
		
 
                                   active=True))

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        subject = u'test'

			




	
	
	
		
 
        notif_body = u'hi there'

			




	
	
	
		
 
        notification = NotificationModel().create(created_by=cur_user,

			




	
	
	
		
 
                                                  subject=subject,

			




	
	
	
		
 
                                                  body=notif_body,

			




	
	
	
		
 
                                                  recipients=[cur_user, u1, u2])

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.