Revision 72313b77
| b/snf-astakos-app/astakos/im/models.py | ||
|---|---|---|
| 1108 | 1108 |
user.save() |
| 1109 | 1109 |
email_change.delete() |
| 1110 | 1110 |
msg = "User %s changed email from %s to %s" |
| 1111 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, user.log_display, old_email, user.email) |
|
| 1111 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, user.log_display, |
|
| 1112 |
old_email, user.email) |
|
| 1112 | 1113 |
return user |
| 1113 | 1114 |
except EmailChange.DoesNotExist: |
| 1114 | 1115 |
raise ValueError(_('Invalid activation key.'))
|
| ... | ... | |
| 1561 | 1562 |
relevant = model.o_states_q(model.RELEVANT_STATES) |
| 1562 | 1563 |
return self.filter(flt, relevant).order_by( |
| 1563 | 1564 |
'application__issue_date').select_related( |
| 1564 |
'application', 'application__owner', 'application__applicant')
|
|
| 1565 |
'application', 'application__owner', 'application__applicant') |
|
| 1565 | 1566 |
|
| 1566 | 1567 |
def search_by_name(self, *search_strings): |
| 1567 | 1568 |
q = Q() |
| b/snf-astakos-app/astakos/im/views/projects.py | ||
|---|---|---|
| 433 | 433 |
else: |
| 434 | 434 |
accepted = request.user.projectmembership_set.filter( |
| 435 | 435 |
state__in=ProjectMembership.ACCEPTED_STATES).values_list( |
| 436 |
'project', flat=True)
|
|
| 436 |
'project', flat=True) |
|
| 437 | 437 |
|
| 438 | 438 |
projects = Project.objects.search_by_name(q) |
| 439 | 439 |
projects = projects.filter(Project.o_state_q(Project.O_ACTIVE)) |
| b/snf-astakos-app/astakos/synnefo_settings.py | ||
|---|---|---|
| 46 | 46 |
'django_tables2', |
| 47 | 47 |
'astakos.quotaholder_app', |
| 48 | 48 |
'synnefo_branding', |
| 49 |
# 'debug_toolbar',
|
|
| 49 |
# 'debug_toolbar',
|
|
| 50 | 50 |
] |
| 51 | 51 |
|
| 52 | 52 |
context_processors = [ |
Also available in: Unified diff