Projet

Général

Profil

0001-contacts-display-user-roles-in-contact-zone-12630.patch

Thomas Noël, 27 septembre 2016 18:09

Télécharger (3,89 ko)

Voir les différences: 

Subject: [PATCH] contacts: display user roles in contact zone (#12630)


 .../templates/contacts/contact_detail_fragment.html     | 17 +++++++++--------
 welco/contacts/views.py                                 |  4 +++-
 welco/static/css/style.css                              |  5 +++++
 welco/static/js/welco.js                                |  3 +++
 4 files changed, 20 insertions(+), 9 deletions(-)
welco/contacts/templates/contacts/contact_detail_fragment.html
2 2 
<div class="contact">
3 3 
<input type="hidden" id="current-selected-user" name="current-selected-user" value="{{user_id}}"/>
4 4 
<h3>{{user_display_name}}</h3>
5 
{% if user_var_address or user_var_city %}
6 
<p>{{user_var_address}} / {{user_var_zipcode}} {{user_var_city}}</p>
5 
{% if user_roles %}
6 
<p>{% for role in user_roles %}{{ role.text }}{% if not forloop.last %} / {% endif %}{% endfor %}</p>
7 7 
{% endif %}
8 
{% if user_var_phone or user_var_mobile or user_var_email %}
9 
<p>
10 
  {% if user_var_phone %}{% trans 'Phone:' %} {{user_var_phone}}{% endif %}
11 
  {% if user_var_mobile %}{% trans 'Mobile:' %} {{user_var_mobile}}{% endif %}
12 
  {% if user_var_email %}{% trans 'Email:' %} {{user_var_email}}{% endif %}
13 
</p>
8 
<ul>
9 
{% if user_var_address or user_var_city %}
10 
<li>{% trans 'Address:' %} {{user_var_address}} / {{user_var_zipcode}} {{user_var_city}}</li>
14 11 
{% endif %}
12 
{% if user_var_phone %}<li>{% trans 'Phone:' %} {{user_var_phone}}</li>{% endif %}
13 
{% if user_var_mobile %}<li>{% trans 'Mobile:' %} {{user_var_mobile}}</li>{% endif %}
14 
{% if user_var_email %}<li>{% trans 'Email:' %} {{user_var_email}}</li>{% endif %}
15 
</ul>
15 16 

  		




  16
  17
  
    
{% if forms %}

  		




  17
  18
  
    
<ul class="formdatas">

  		












  

    
      welco/contacts/views.py
    
  





  84
  84
  
    
        for user in result.get('data'):

  		




  85
  85
  
    
            user['title'] = user['user_display_name']

  		




  86
  86
  
    
            more = [user.get('user_var_address'), user.get('user_var_phone'),

  		




  87
  
  
    
                user.get('user_var_birthdate'), user.get('user_var_email')]

  		




  
  87
  
    
                user.get('user_var_mobile'), user.get('user_var_email')]

  		




  88
  88
  
    
            user['more'] = ' / '.join([x for x in more if x])

  		




  
  89
  
    
            if user.get('user_roles'):

  		




  
  90
  
    
                user['roles'] = ' / '.join([r['text'] for r in user['user_roles']])

  		




  89
  91
  
    
            user['slug'] = 'user-%s' % user['user_id']

  		




  90
  92
  
    
    else:

  		




  91
  93
  
    
        result = {'data': []}

  		












  

    
      welco/static/css/style.css
    
  





  251
  251
  
    
	color: #3c3c33;

  		




  252
  252
  
    
}

  		




  253
  253
  
    

  		




  
  254
  
    
ul.result li a span.roles {

  		




  
  255
  
    
	display: block;

  		




  
  256
  
    
	color: #333;

  		




  
  257
  
    
}

  		




  
  258
  
    

  		




  254
  259
  
    
ul.result li a span.more {

  		




  255
  260
  
    
	display: block;

  		




  256
  261
  
    
	color: #666;

  		












  

    
      welco/static/js/welco.js
    
  





  295
  295
  
    
                    search_result_ul.empty();

  		




  296
  296
  
    
                    $(response.data).each(function(idx, elem) {

  		




  297
  297
  
    
                       var new_elem = '<li><a href="#" data-page-slug="' + elem.slug + '">' + elem.title;

  		




  
  298
  
    
                       if (elem.roles) {

  		




  
  299
  
    
                         new_elem = new_elem + ' <span class="roles">' + elem.roles + '</span>';

  		




  
  300
  
    
                       }

  		




  298
  301
  
    
                       if (elem.more) {

  		




  299
  302
  
    
                         new_elem = new_elem + ' <span class="more">' + elem.more + '</span>';

  		




  300
  303
  
    
                       }

  		




  301
  
  
    
-