haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-28 07:57:50 +00:00
Code Issues Releases Wiki Activity

Disable add unregistered user to group

Browse Source
This commit is contained in:
xiez 2012-09-26 20:22:09 +08:00
parent 91d3d78dda
commit 64bd2247bb
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group/templates/group/group_manage.html
View File

@ -46,7 +46,6 @@
<label>邮箱:</label><br /> <label>邮箱:</label><br />
<textarea id="added-member-name" name="user_name"></textarea><br /> <textarea id="added-member-name" name="user_name"></textarea><br />
<input type="hidden" id="group_id" name="group_id" value="{{ group.id }}" /> <input type="hidden" id="group_id" name="group_id" value="{{ group.id }}" />
<p class="tip">可以是非网站注册用户，我们会以邮件通知对方。</p>
<p class="error hide" id="member-add-error"></p> <p class="error hide" id="member-add-error"></p>
<input type="submit" value="提交" id="member-add-submit" /> <input type="submit" value="提交" id="member-add-submit" />
</form> </form>

44
group/views.py
View File

@ -538,28 +538,32 @@ def group_members(request, group_id):
mail_sended.send(sender=None, user=request.user.username, mail_sended.send(sender=None, user=request.user.username,
email=member_name) email=member_name)
# Send email to unregistered user.
if not is_registered_user(member_name): if not is_registered_user(member_name):
use_https = request.is_secure() err_msg = u'无法添加成员，%s 未注册' % member_name
domain = RequestSite(request).domain result['error'] = err_msg
return HttpResponse(json.dumps(result), status=400,
t = loader.get_template('group/add_member_email.html') content_type=content_type)
c = {
'email': request.user.username,
'to_email': member_name,
'group': group,
'domain': domain,
'protocol': use_https and 'https' or 'http',
}
try: # use_https = request.is_secure()
send_mail('您的好友在SeaCloud上将你加入到群组', # domain = RequestSite(request).domain
t.render(Context(c)), None, [member_name],
fail_silently=False) # t = loader.get_template('group/add_member_email.html')
except: # c = {
data = json.dumps({'error': u'发送失败'}) # 'email': request.user.username,
return HttpResponse(data, status=500, # 'to_email': member_name,
content_type=content_type) # 'group': group,
# 'domain': domain,
# 'protocol': use_https and 'https' or 'http',
# }
# try:
# send_mail('您的好友在SeaCloud上将你加入到群组',
# t.render(Context(c)), None, [member_name],
# fail_silently=False)
# except:
# data = json.dumps({'error': u'发送失败'})
# return HttpResponse(data, status=500,
# content_type=content_type)
# Add user to group. # Add user to group.
try: try:
ccnet_threaded_rpc.group_add_member(group_id_int, ccnet_threaded_rpc.group_add_member(group_id_int,