Permalink
Browse files

Merge branch 'master' of github.com:cnprog/CNPROG

  • Loading branch information...
2 parents 582a668 + 130c648 commit 07fea9955202f0b23221081ca171192a6c7350f2 @chagel committed Apr 3, 2010
Showing with 5 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +1 −2 forum/views.py
  3. +1 −1 settings_local.py.dist
  4. +2 −1 templates/badge.html
View
@@ -4,3 +4,4 @@ nbproject
settings_local.py
log
*.log
+.DS_Store
View
@@ -1820,8 +1820,7 @@ def badge(request, id):
tables=['award', 'auth_user'],
where=['badge_id=%s AND user_id=auth_user.id'],
params=[id]
- ).values('id').distinct()
-
+ ).distinct('auth_user.id')
return render_to_response('badge.html', {
'awards': awards,
'badge': badge,
View
@@ -17,7 +17,7 @@ DATABASE_ENGINE = '' #mysql, etc
#email server settings
SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+DEFAULT_FROM_EMAIL = 'admin@yoursite.com'
EMAIL_HOST_USER = ''
EMAIL_HOST_PASSWORD = ''
EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
View
@@ -28,7 +28,8 @@
</div>
<div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
{% for award in awards %}
- <p style="width:185px;float:left"><a href="/users/{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
+ <p style="width:185px;float:left"><a href="/users/{{ award.id }}/{{ award.name }}">{{ award.name }}</a>
+ {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
{% endfor %}
</div>

1 comment on commit 07fea99

-DEFAULT_FROM_EMAIL = 'team@http://www.infoindiabank.in/'

20  

+DEFAULT_FROM_EMAIL = 'admin@http://www.infoindiabank.in/'

we should code it lke this right

Please sign in to comment.