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
2
2
kallithea/public/js/base.js
1
1
kallithea/templates/admin/notifications/notifications.html
2
2
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -332,98 +332,98 @@ def make_map(config):
 
                  action="settings_system_update", conditions=dict(method=["GET"]))
 

			




	
	
	
		
 
    #ADMIN MY ACCOUNT

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/my_account') as m:

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_password", "/my_account/password",

			




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

			




	
	
	
		
 
        m.connect("my_account_password", "/my_account/password",

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_repos", "/my_account/repos",

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_watched", "/my_account/watched",

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_perms", "/my_account/perms",

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_emails", "/my_account/emails",

			




	
	
	
		
 
                  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("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"]))

			




	
	
	
		
 

			




	
	
	
		
 
    #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"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




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

			




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

			




	
	
	
		
 
                  revision="tip",

			




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

			




	
	
	
		
 
        m.connect("formatted_gist", "/gists/{gist_id}/{revision}/{format}",

			




	
	
	
		
 
                  revision="tip",

			




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

			




	
	
	
		
 
        m.connect("formatted_gist_file", "/gists/{gist_id}/{revision}/{format}/{f_path:.*}",

			




	
	
	
		
 
                  revision='tip',

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN MAIN PAGES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/admin') as m:

			




	
	
	
		
 
        m.connect('admin_home', '', action='index')

			




	
	
	
		
 
        m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',

			




	
	
	
		
 
                  action='add_repo')

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # API V2

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




        

    


    
    

    

        

                

                    kallithea/public/js/base.js
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -970,97 +970,97 @@ var getSelectionLink = function(e) {

			




	
	
	
		
 
            //highlight from bottom

			




	
	
	
		
 
            yoffset = -yoffset;

			




	
	
	
		
 
            ranges = [ranges[1], ranges[0]];

			




	
	
	
		
 
        }

			




	
	
	
		
 
        var $hl_div = $('div#linktt');

			




	
	
	
		
 
        // if we select more than 2 lines

			




	
	
	
		
 
        if (ranges[0] != ranges[1]){

			




	
	
	
		
 
            if ($hl_div.length) {

			




	
	
	
		
 
                $hl_div.html('');

			




	
	
	
		
 
            } 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 = {};

			




	
	
	
		
 
    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 postData = {};

			




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

			




	
	
	
		
 
    ajaxPOST(sUrl, postData, success, failure);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Autocomplete functionality

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
// Custom search function for the DataSource of users

			




	
	
	
		
 
var autocompleteMatchUsers = function (sQuery, myUsers) {

			




	
	
	
		
 
    // Case insensitive matching

			




	
	
	
		
 
    var query = sQuery.toLowerCase();

			




	
	
	
		
 
    var i = 0;

			




	
	
	
		
 
    var l = myUsers.length;

			




	
	
	
		
 
    var matches = [];

			




	
	
	
		
 

			




	
	
	
		
 
    // Match against each name of each contact

			




	
	
	
		
 
    for (; i < l; i++) {

			




	
	
	
		
 
        var contact = myUsers[i];

			




	
	
	
		
 
        if (((contact.fname+"").toLowerCase().indexOf(query) > -1) ||

			




	
	
	
		
 
             ((contact.lname+"").toLowerCase().indexOf(query) > -1) ||

			




	
	
	
		
 
             ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) {

			




	
	
	
		
 
            matches[matches.length] = contact;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    return matches;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
// Custom search function for the DataSource of userGroups

			




	
	
	
		
 
var autocompleteMatchGroups = function (sQuery, myGroups) {

			




	
	
	
		
 
    // Case insensitive matching

			




	
	
	
		
 
    var query = sQuery.toLowerCase();

			




	
	
	
		
 
    var i = 0;

			




	
	
	
		
 
    var l = myGroups.length;

			




	
	
	
		
 
    var matches = [];

			




	
	
	
		
 

			




	
	
	
		
 
    // Match against each name of each group

			




	
	
	
		
 
    for (; i < l; i++) {

			




	
	
	
		
 
        var matched_group = myGroups[i];

			




	
	
	
		
 
        if (matched_group.grname.toLowerCase().indexOf(query) > -1) {

			




	
	
	
		
 
            matches[matches.length] = matched_group;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    return matches;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
// Helper highlight function for the formatter

			




	
	
	
		
 
var autocompleteHighlightMatch = function (full, snippet, matchindex) {

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/notifications.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${_('My Notifications')} ${c.authuser.username}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('My Notifications')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%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 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();});

			




	
	
	
		
 
});

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.