Merge branch '2459-search-associate-only-in-members' into 'dev_cooperatic'

2459-search-associate-only-in-members

See merge request !138

members/models.py

@@ -775,9 +775,12 @@ class CagetteMember(models.Model):
             cond = [['name', 'ilike', str(key)]]
         cond.append('|')
         cond.append(['is_member', '=', True])
-        cond.append(['is_associated_people', '=', True])
+        if search_type != 'members':
+            cond.append(['is_associated_people', '=', True])
+        else:
+            cond.append(['is_associated_people', '=', False])
         # cond.append(['cooperative_state', '!=', 'unsubscribed'])
-        if search_type == "full":
+        if search_type == "full" or search_type == 'members':
             fields = CagetteMember.m_default_fields
             if not shift_id is None:
                 CagetteMember.m_default_fields.append('tmpl_reg_line_ids')

members/static/js/inscriptions.js

@@ -689,7 +689,7 @@ $(document).ready(function() {
 
         if (search_str) {
             $.ajax({
-                url: '/members/search/' + search_str,
+                url: '/members/search/' + search_str+ "?search_type=members",
                 dataType : 'json',
                 success: function(data) {
                     members_search_results = [];