Changeset - a36a8804e7be
Parent rev.
Child rev.
[Not reviewed]
default
0 12 0
Mads Kiilerich (mads) - 5 years ago 2020-12-18 22:24:48
mads@kiilerich.com
Grafted from: f7c6ee9b26f5
lib: use webutils for special mako templates - helpers is only for controller web templates
12 files changed with 48 insertions and 49 deletions:
kallithea/controllers/admin/repo_groups.py
2
3
kallithea/controllers/admin/user_groups.py
2
2
kallithea/controllers/admin/users.py
2
2
kallithea/model/notification.py
1
3
kallithea/model/repo.py
7
4
kallithea/templates/data_table/_dt_elements.html
25
25
kallithea/templates/email/changeset_comment.html
2
2
kallithea/templates/email/changeset_comment.txt
2
2
kallithea/templates/email/pull_request.html
2
2
kallithea/templates/email/pull_request.txt
1
1
kallithea/tests/models/test_notifications.py
2
2
scripts/deps.py
1
0 comments (0 inline, 0 general)
kallithea/controllers/admin/repo_groups.py
➞
Show inline comments
 
@@ -33,13 +33,12 @@ from formencode import htmlfill
 
from tg import app_globals, request
 
from tg import tmpl_context as c
 
from tg.i18n import ugettext as _
 
from tg.i18n import ungettext
 
from webob.exc import HTTPForbidden, HTTPFound, HTTPInternalServerError, HTTPNotFound
 

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 
from kallithea.controllers import base

			




	
	
	
		
 
from kallithea.lib import webutils

			




	
	
	
		
 
from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoGroupPermissionLevelDecorator, LoginRequired

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_int

			




	
	
	
		
 
from kallithea.lib.webutils import url

			




	
	
	
		
 
from kallithea.model import db, meta

			




	
	
		
 
@@ -103,17 +102,17 @@ class RepoGroupsController(base.BaseCont

			




	
	
	
		
 
        repo_groups_data = []

			




	
	
	
		
 
        _tmpl_lookup = app_globals.mako_lookup

			




	
	
	
		
 
        template = _tmpl_lookup.get_template('data_table/_dt_elements.html')

			




	
	
	
		
 

			




	
	
	
		
 
        def repo_group_name(repo_group_name, children_groups):

			




	
	
	
		
 
            return template.get_def("repo_group_name") \

			




	
	
	
		
 
                .render_unicode(repo_group_name, children_groups, _=_, h=h, c=c)

			




	
	
	
		
 
                .render_unicode(repo_group_name, children_groups, _=_, webutils=webutils, c=c)

			




	
	
	
		
 

			




	
	
	
		
 
        def repo_group_actions(repo_group_id, repo_group_name, gr_count):

			




	
	
	
		
 
            return template.get_def("repo_group_actions") \

			




	
	
	
		
 
                .render_unicode(repo_group_id, repo_group_name, gr_count, _=_, h=h, c=c,

			




	
	
	
		
 
                .render_unicode(repo_group_id, repo_group_name, gr_count, _=_, webutils=webutils, c=c,

			




	
	
	
		
 
                        ungettext=ungettext)

			




	
	
	
		
 

			




	
	
	
		
 
        for repo_gr in group_iter:

			




	
	
	
		
 
            children_groups = [g.name for g in repo_gr.parents] + [repo_gr.name]

			




	
	
	
		
 
            repo_count = repo_gr.repositories.count()

			




	
	
	
		
 
            repo_groups_data.append({

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/user_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -86,17 +86,17 @@ class UserGroupsController(base.BaseCont

			




	
	
	
		
 
        user_groups_data = []

			




	
	
	
		
 
        _tmpl_lookup = app_globals.mako_lookup

			




	
	
	
		
 
        template = _tmpl_lookup.get_template('data_table/_dt_elements.html')

			




	
	
	
		
 

			




	
	
	
		
 
        def user_group_name(user_group_id, user_group_name):

			




	
	
	
		
 
            return template.get_def("user_group_name") \

			




	
	
	
		
 
                .render_unicode(user_group_id, user_group_name, _=_, h=h, c=c)

			




	
	
	
		
 
                .render_unicode(user_group_id, user_group_name, _=_, webutils=webutils, c=c)

			




	
	
	
		
 

			




	
	
	
		
 
        def user_group_actions(user_group_id, user_group_name):

			




	
	
	
		
 
            return template.get_def("user_group_actions") \

			




	
	
	
		
 
                .render_unicode(user_group_id, user_group_name, _=_, h=h, c=c)

			




	
	
	
		
 
                .render_unicode(user_group_id, user_group_name, _=_, webutils=webutils, c=c)

			




	
	
	
		
 

			




	
	
	
		
 
        for user_gr in group_iter:

			




	
	
	
		
 
            user_groups_data.append({

			




	
	
	
		
 
                "raw_name": user_gr.users_group_name,

			




	
	
	
		
 
                "group_name": user_group_name(user_gr.users_group_id,

			




	
	
	
		
 
                                              user_gr.users_group_name),

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/users.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -72,17 +72,17 @@ class UsersController(base.BaseControlle

			




	
	
	
		
 
        template = _tmpl_lookup.get_template('data_table/_dt_elements.html')

			




	
	
	
		
 

			




	
	
	
		
 
        grav_tmpl = '<div class="gravatar">%s</div>'

			




	
	
	
		
 

			




	
	
	
		
 
        def username(user_id, username):

			




	
	
	
		
 
            return template.get_def("user_name") \

			




	
	
	
		
 
                .render_unicode(user_id, username, _=_, h=h, c=c)

			




	
	
	
		
 
                .render_unicode(user_id, username, _=_, webutils=webutils, c=c)

			




	
	
	
		
 

			




	
	
	
		
 
        def user_actions(user_id, username):

			




	
	
	
		
 
            return template.get_def("user_actions") \

			




	
	
	
		
 
                .render_unicode(user_id, username, _=_, h=h, c=c)

			




	
	
	
		
 
                .render_unicode(user_id, username, _=_, webutils=webutils, c=c)

			




	
	
	
		
 

			




	
	
	
		
 
        for user in c.users_list:

			




	
	
	
		
 
            users_data.append({

			




	
	
	
		
 
                "gravatar": grav_tmpl % h.gravatar(user.email, size=20),

			




	
	
	
		
 
                "raw_name": user.username,

			




	
	
	
		
 
                "username": username(user.user_id, user.username),

			




        

    


    
    

    

        

                

                    kallithea/model/notification.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -196,19 +196,17 @@ class EmailNotificationModel(object):

			




	
	
	
		
 
        return subj

			




	
	
	
		
 

			




	
	
	
		
 
    def get_email_tmpl(self, type_, content_type, **kwargs):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        return generated template for email based on given type

			




	
	
	
		
 
        """

			




	
	
	
		
 
        import kallithea.lib.helpers as h

			




	
	
	
		
 

			




	
	
	
		
 
        base = 'email/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type

			




	
	
	
		
 
        email_template = self._tmpl_lookup.get_template(base)

			




	
	
	
		
 
        # translator and helpers inject

			




	
	
	
		
 
        _kwargs = {'_': _,

			




	
	
	
		
 
                   'h': h,

			




	
	
	
		
 
                   'webutils': webutils,

			




	
	
	
		
 
                   'c': c}

			




	
	
	
		
 
        _kwargs.update(kwargs)

			




	
	
	
		
 
        if content_type == 'html':

			




	
	
	
		
 
            _kwargs.update({

			




	
	
	
		
 
                "color_text": "#202020",

			




	
	
	
		
 
                "color_emph": "#395fa0",

			




        

    


    
    

    

        

                

                    kallithea/model/repo.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -92,20 +92,23 @@ class RepoModel(object):

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def _render_datatable(cls, tmpl, *args, **kwargs):

			




	
	
	
		
 
        from tg import app_globals, request

			




	
	
	
		
 
        from tg import tmpl_context as c

			




	
	
	
		
 
        from tg.i18n import ugettext as _

			




	
	
	
		
 

			




	
	
	
		
 
        import kallithea.lib.helpers as h

			




	
	
	
		
 

			




	
	
	
		
 
        _tmpl_lookup = app_globals.mako_lookup

			




	
	
	
		
 
        template = _tmpl_lookup.get_template('data_table/_dt_elements.html')

			




	
	
	
		
 

			




	
	
	
		
 
        tmpl = template.get_def(tmpl)

			




	
	
	
		
 
        kwargs.update(dict(_=_, h=h, c=c, request=request))

			




	
	
	
		
 
        return tmpl.render_unicode(*args, **kwargs)

			




	
	
	
		
 
        return tmpl.render_unicode(

			




	
	
	
		
 
            *args,

			




	
	
	
		
 
            _=_,

			




	
	
	
		
 
            webutils=webutils,

			




	
	
	
		
 
            c=c,

			




	
	
	
		
 
            request=request,

			




	
	
	
		
 
            **kwargs)

			




	
	
	
		
 

			




	
	
	
		
 
    def get_repos_as_dict(self, repos_list, repo_groups_list=None,

			




	
	
	
		
 
                          admin=False,

			




	
	
	
		
 
                          short_name=False):

			




	
	
	
		
 
        """Return repository list for use by DataTable.

			




	
	
	
		
 
        repos_list: list of repositories - but will be filtered for read permission.

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,22 +11,22 @@

			




	
	
	
		
 
        return name.split('/')[-1]

			




	
	
	
		
 
      else:

			




	
	
	
		
 
        return name

			




	
	
	
		
 
    %>

			




	
	
	
		
 
  <div class="dt_repo ${'dt_repo_pending' if rstate == 'repo_state_pending' else ''}">

			




	
	
	
		
 
    ${base.repolabel(rtype)}

			




	
	
	
		
 
    <a href="${h.url('summary_home', repo_name=name)}">

			




	
	
	
		
 
    <a href="${webutils.url('summary_home', repo_name=name)}">

			




	
	
	
		
 
        ${get_name(name)}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
    %if private and c.visual.show_private_icon:

			




	
	
	
		
 
      <i class="icon-lock" title="${_('Private repository')}"></i>

			




	
	
	
		
 
    %elif not private and c.visual.show_public_icon:

			




	
	
	
		
 
      <i class="icon-globe" title="${_('Public repository')}"></i>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if fork_of:

			




	
	
	
		
 
      <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>

			




	
	
	
		
 
      <a href="${webutils.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if rstate == 'repo_state_pending':

			




	
	
	
		
 
      <i class="icon-wrench" title="${_('Repository creation in progress...')}"></i>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
		
 
@@ -35,49 +35,49 @@

			




	
	
	
		
 
  %if request.authuser.username != 'default':

			




	
	
	
		
 
    <a href="#" class="${'following' if repo_following else 'follow'}" onclick="return toggleFollowingRepo(this, ${repo_id});"><i class="list-extra icon-heart-empty show-follow" title="${_('Follow')}"></i><i class="list-extra icon-heart show-following" title="${_('Unfollow')}"></i></a>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="last_change(last_change)">

			




	
	
	
		
 
  <span data-toggle="tooltip" title="${h.fmt_date(last_change)}" date="${last_change}">${h.age(last_change)}</span>

			




	
	
	
		
 
  <span data-toggle="tooltip" title="${webutils.fmt_date(last_change)}" date="${last_change}">${webutils.age(last_change)}</span>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="revision(name,rev,tip,author,last_msg)">

			




	
	
	
		
 
  %if rev >= 0:

			




	
	
	
		
 
      <a data-toggle="popover" title="${author | entity}" data-content="${last_msg | entity}" class="changeset_hash" href="${h.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,h.short_id(tip))}</a>

			




	
	
	
		
 
      <a data-toggle="popover" title="${author | entity}" data-content="${last_msg | entity}" class="changeset_hash" href="${webutils.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,webutils.short_id(tip))}</a>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
      ${_('No changesets yet')}

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="rss(name)">

			




	
	
	
		
 
  %if request.authuser.username != 'default':

			




	
	
	
		
 
    <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
    <a title="${_('Subscribe to %s rss feed')% name}" href="${webutils.url('rss_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
    <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
    <a title="${_('Subscribe to %s rss feed')% name}" href="${webutils.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="atom(name)">

			




	
	
	
		
 
  %if request.authuser.username != 'default':

			




	
	
	
		
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${webutils.url('atom_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${webutils.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_actions(repo_name)">

			




	
	
	
		
 
      <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
      <a href="${webutils.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
        <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
      </a>

			




	
	
	
		
 
      ${h.form(h.url('delete_repo', repo_name=repo_name))}

			




	
	
	
		
 
      ${webutils.form(webutils.url('delete_repo', repo_name=repo_name))}

			




	
	
	
		
 
        <button name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs"

			




	
	
	
		
 
            onclick="return confirm('${_('Confirm to delete this repository: %s') % repo_name}');">

			




	
	
	
		
 
          <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
        </button>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
      ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_state(repo_state)">

			




	
	
	
		
 
    %if repo_state == u'repo_state_pending':

			




	
	
	
		
 
        <div class="label label-info">${_('Creating')}</div>

			




	
	
	
		
 
    %elif repo_state == u'repo_state_created':

			




	
	
		
 
@@ -85,65 +85,65 @@

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <div class="label label-danger" title="${repo_state}">invalid</div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_actions(user_id, username)">

			




	
	
	
		
 
   <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
   <a href="${webutils.url('edit_user',id=user_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
     <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
   </a>

			




	
	
	
		
 
  ${h.form(h.url('delete_user', id=user_id))}

			




	
	
	
		
 
  ${webutils.form(webutils.url('delete_user', id=user_id))}

			




	
	
	
		
 
    <button id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
        onclick="return confirm('${_('Confirm to delete this user: %s') % username}');">

			




	
	
	
		
 
      <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
    </button>

			




	
	
	
		
 
  ${h.end_form()}

			




	
	
	
		
 
  ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_group_actions(user_group_id, user_group_name)">

			




	
	
	
		
 
    <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
    <a href="${webutils.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
      <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
    ${h.form(h.url('delete_users_group', id=user_group_id))}

			




	
	
	
		
 
    ${webutils.form(webutils.url('delete_users_group', id=user_group_id))}

			




	
	
	
		
 
      <button id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
          onclick="return confirm('${_('Confirm to delete this user group: %s') % user_group_name}');">

			




	
	
	
		
 
        <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
      </button>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
    ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="group_name_html(group_name,name)">

			




	
	
	
		
 
  <div class="dt_repo">

			




	
	
	
		
 
    <i class="icon-folder"></i>

			




	
	
	
		
 
    <a href="${h.url('repos_group_home',group_name=group_name)}">${name}</a>

			




	
	
	
		
 
    <a href="${webutils.url('repos_group_home',group_name=group_name)}">${name}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)">

			




	
	
	
		
 
    <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
    <a href="${webutils.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
      <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
    ${h.form(h.url('delete_repo_group', group_name=repo_group_name))}

			




	
	
	
		
 
    ${webutils.form(webutils.url('delete_repo_group', group_name=repo_group_name))}

			




	
	
	
		
 
      <button id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
          onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)}')">

			




	
	
	
		
 
        <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
      </button>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
    ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_name(user_id, username)">

			




	
	
	
		
 
    ${h.link_to(username,h.url('edit_user', id=user_id))}

			




	
	
	
		
 
    ${webutils.link_to(username,webutils.url('edit_user', id=user_id))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_name(repo_group_name, children_groups)">

			




	
	
	
		
 
  <div class="text-nowrap">

			




	
	
	
		
 
  <a href="${h.url('repos_group_home',group_name=repo_group_name)}">

			




	
	
	
		
 
    <i class="icon-folder" title="${_('Repository group')}"></i>${h.literal(' &raquo; ').join(children_groups)}</a>

			




	
	
	
		
 
  <a href="${webutils.url('repos_group_home',group_name=repo_group_name)}">

			




	
	
	
		
 
    <i class="icon-folder" title="${_('Repository group')}"></i>${webutils.literal(' &raquo; ').join(children_groups)}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_group_name(user_group_id, user_group_name)">

			




	
	
	
		
 
  <div class="text-nowrap">

			




	
	
	
		
 
  <a href="${h.url('edit_users_group', id=user_group_id)}">

			




	
	
	
		
 
  <a href="${webutils.url('edit_users_group', id=user_group_id)}">

			




	
	
	
		
 
    <i class="icon-users" title="${_('User group')}"></i>${user_group_name}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/email/changeset_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<%inherit file="main.html"/>\

			




	
	
	
		
 
\

			




	
	
	
		
 
<%block name="header">\

			




	
	
	
		
 
<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\

			




	
	
	
		
 
<% title = _('Mention in Comment on Changeset "%s"') % webutils.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % webutils.shorter(message, 200, firstline=True) %>\

			




	
	
	
		
 
<%include file="header.html" args="title=title,link=cs_comment_url"/>\

			




	
	
	
		
 
</%block>\

			




	
	
	
		
 
\

			




	
	
	
		
 
<table cellpadding="0" cellspacing="0" border="0" width="100%">

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td>

			




	
	
		
 
@@ -22,13 +22,13 @@

			




	
	
	
		
 
                   href="${cs_target_repo}">${cs_target_repo}</a>

			




	
	
	
		
 
                ${_('branch')}

			




	
	
	
		
 
                <span style="${data_style}">${branch}</span>:

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
                "<a style="${link_style}"

			




	
	
	
		
 
                   href="${cs_url}">${h.shorter(message, 60, firstline=True)}</a>"

			




	
	
	
		
 
                   href="${cs_url}">${webutils.shorter(message, 60, firstline=True)}</a>"

			




	
	
	
		
 
                ${_('by')}

			




	
	
	
		
 
                <span style="${data_style}">${cs_author.full_name_and_username}</span>.

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <tr>

			




        

    


    
    

    

        

                

                    kallithea/templates/email/changeset_comment.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<%block name="header">\

			




	
	
	
		
 
<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\

			




	
	
	
		
 
<% title = _('Mention in Comment on Changeset "%s"') % webutils.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % webutils.shorter(message, 200, firstline=True) %>\

			




	
	
	
		
 
<%include file="header.txt" args="title=title,link=cs_comment_url"/>\

			




	
	
	
		
 
</%block>\

			




	
	
	
		
 

			




	
	
	
		
 
<%include file="comment.txt" args="text=body,author=cs_comment_user,status=status_change"/>\

			




	
	
	
		
 

			




	
	
	
		
 
${_('Changeset on')|n,unicode} \

			




	
	
	
		
 
${cs_target_repo|n,unicode} \

			




	
	
	
		
 
${_('branch')|n,unicode} \

			




	
	
	
		
 
${branch|n,unicode}:

			




	
	
	
		
 
"${h.shorter(message, 60, firstline=True)|n,unicode}" \

			




	
	
	
		
 
"${webutils.shorter(message, 60, firstline=True)|n,unicode}" \

			




	
	
	
		
 
${_('by')|n,unicode} \

			




	
	
	
		
 
${cs_author.full_name_and_username|n,unicode}.

			




	
	
	
		
 

			




	
	
	
		
 
<% title = _('View Comment') %>\

			




	
	
	
		
 
<%include file="button.txt" args="url=cs_comment_url,title=title"/>\

			




        

    


    
    

    

        

                

                    kallithea/templates/email/pull_request.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -69,14 +69,14 @@

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td style="${sans_style}">

			




	
	
	
		
 
            <ul style="color:${color_link};padding-left:15px;margin:0">

			




	
	
	
		
 
                %for revision, desc in pr_revisions:

			




	
	
	
		
 
                    <li style="mso-special-format:bullet">

			




	
	
	
		
 
                        <a style="${link_style}"

			




	
	
	
		
 
                           href="${h.canonical_url('changeset_home', repo_name=org_repo_name, revision=revision)}">

			




	
	
	
		
 
                            ${h.shorter(desc, 80, firstline=True)}

			




	
	
	
		
 
                           href="${webutils.canonical_url('changeset_home', repo_name=org_repo_name, revision=revision)}">

			




	
	
	
		
 
                            ${webutils.shorter(desc, 80, firstline=True)}

			




	
	
	
		
 
                        </a>

			




	
	
	
		
 
                    </li>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




        

    


    
    

    

        

                

                    kallithea/templates/email/pull_request.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,11 +23,11 @@ ${_('Description')|n,unicode}:

			




	
	
	
		
 
${body|n,unicode}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
${_('Changesets')|n,unicode}:

			




	
	
	
		
 

			




	
	
	
		
 
%for revision, desc in pr_revisions:

			




	
	
	
		
 
${h.shorter(desc, 80, firstline=True)|n,unicode}

			




	
	
	
		
 
${webutils.shorter(desc, 80, firstline=True)|n,unicode}

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
<% title = _('View Pull Request') %>\

			




	
	
	
		
 
<%include file="button.txt" args="url=pr_url,title=title"/>\

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_notifications.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,14 +2,14 @@ import os

			




	
	
	
		
 
import re

			




	
	
	
		
 

			




	
	
	
		
 
import mock

			




	
	
	
		
 
from tg.util.webtest import test_context

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.celerylib

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 
import kallithea.model.async_tasks

			




	
	
	
		
 
from kallithea.lib import webutils

			




	
	
	
		
 
from kallithea.model import db, meta

			




	
	
	
		
 
from kallithea.model.notification import EmailNotificationModel, NotificationModel

			




	
	
	
		
 
from kallithea.model.user import UserModel

			




	
	
	
		
 
from kallithea.tests import base

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
		
 
@@ -50,13 +50,13 @@ class TestNotifications(base.TestControl

			




	
	
	
		
 
                assert from_name == 'u1 u1'

			




	
	
	
		
 
            with mock.patch.object(kallithea.model.async_tasks, 'send_email', send_email):

			




	
	
	
		
 
                NotificationModel().create(created_by=self.u1,

			




	
	
	
		
 
                                                   body='hi there',

			




	
	
	
		
 
                                                   recipients=usrs)

			




	
	
	
		
 

			




	
	
	
		
 
    @mock.patch.object(h, 'canonical_url', (lambda arg, **kwargs: 'http://%s/?%s' % (arg, '&'.join('%s=%s' % (k, v) for (k, v) in sorted(kwargs.items())))))

			




	
	
	
		
 
    @mock.patch.object(webutils, 'canonical_url', (lambda arg, **kwargs: 'http://%s/?%s' % (arg, '&'.join('%s=%s' % (k, v) for (k, v) in sorted(kwargs.items())))))

			




	
	
	
		
 
    def test_dump_html_mails(self):

			




	
	
	
		
 
        # Exercise all notification types and dump them to one big html file

			




	
	
	
		
 
        l = []

			




	
	
	
		
 

			




	
	
	
		
 
        def send_email(recipients, subject, body='', html_body='', headers=None, from_name=None):

			




	
	
	
		
 
            l.append('<hr/>\n')

			




        

    


    
    

    

        

                

                    scripts/deps.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -161,13 +161,12 @@ known_violations = [

			




	
	
	
		
 
('kallithea.model.async_tasks', 'kallithea.lib.helpers'),

			




	
	
	
		
 
('kallithea.model.async_tasks', 'kallithea.lib.hooks'),

			




	
	
	
		
 
('kallithea.model.async_tasks', 'kallithea.lib.indexers'),

			




	
	
	
		
 
('kallithea.model.async_tasks', 'kallithea.model'),

			




	
	
	
		
 
('kallithea.model', 'kallithea.lib.auth'),  # auth.HasXXX

			




	
	
	
		
 
('kallithea.model', 'kallithea.lib.auth_modules'),  # validators

			




	
	
	
		
 
('kallithea.model', 'kallithea.lib.helpers'),

			




	
	
	
		
 
('kallithea.model', 'kallithea.lib.hooks'),  # clean up hooks

			




	
	
	
		
 
('kallithea.model', 'kallithea.model.scm'),

			




	
	
	
		
 
('kallithea.model.scm', 'kallithea.lib.hooks'),

			




	
	
	
		
 
]

			




	
	
	
		
 

			




	
	
	
		
 
extra_edges = [

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-31606
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support