haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 03:11:07 +00:00
Code Issues Releases Wiki Activity

Fixed bug in sys useradmin

Browse Source
This commit is contained in:
zhengxie
2013-03-09 20:43:22 +08:00
parent df5d7d22ec
commit 6e30e60373
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
base/accounts.py
View File

@@ -96,9 +96,14 @@ class User(object):
def save(self): def save(self):
emailuser = ccnet_threaded_rpc.get_emailuser(self.username) emailuser = ccnet_threaded_rpc.get_emailuser(self.username)
if emailuser: if emailuser:
ccnet_threaded_rpc.update_emailuser(emailuser.id, self.password, if hasattr(self, 'password'): # setted by set_password()
ccnet_threaded_rpc.update_emailuser(emailuser.id,
self.password,
int(self.is_staff), int(self.is_staff),
int(self.is_active)) int(self.is_active))
else:
# TODO: need a new rpc tp update is_staff and is_active
raise NotImplementedError
else: else:
ccnet_threaded_rpc.add_emailuser(self.username, self.password, ccnet_threaded_rpc.add_emailuser(self.username, self.password,
int(self.is_staff), int(self.is_staff),

6
templates/sys_useradmin.html
View File

@@ -31,9 +31,9 @@
<a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a> <a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a>
<a href="#" class="reset-user-btn op" data-url="{% url 'user_reset' user.id %}" data-target="{{ user.props.email }}">{% trans "ResetPwd" %}</a> <a href="#" class="reset-user-btn op" data-url="{% url 'user_reset' user.id %}" data-target="{{ user.props.email }}">{% trans "ResetPwd" %}</a>
{% if user.is_staff %} {% if user.is_staff %}
<a href="#" class="reset-user-btn op" data-url="{% url 'user_remove_admin' user.id %}" data-target="{{ user.props.email }}">{% trans "Take Admin" %}</a> <a href="#" class="take-admin-btn op" data="{% url 'user_remove_admin' user.id %}">{% trans "Take Admin" %}</a>
{% else %} {% else %}
<a href="#" class="reset-user-btn op" data-url="{% url 'user_make_admin' user.id %}" data-target="{{ user.props.email }}">{% trans "Give Admin" %}</a> <a href="#" class="give-admin-btn op" data="{% url 'user_make_admin' user.id %}">{% trans "Give Admin" %}</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</td> </td>
@@ -73,7 +73,7 @@
{% block extra_script %} {% block extra_script %}
<script type="text/javascript"> <script type="text/javascript">
$('.activate').each(function(){ $('.activate,.give-admin-btn,take-admin-btn').each(function(){
$(this).click(function(){ $(this).click(function(){
location.href = $(this).attr('data'); location.href = $(this).attr('data');
}); });

4
urls.py
View File

@@ -80,8 +80,8 @@ urlpatterns = patterns('',
(r'^useradmin/add/$', user_add), (r'^useradmin/add/$', user_add),
(r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove), (r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove),
(r'^useradmin/makeadmin/(?P<user_id>[^/]+)/$', user_make_admin), url(r'^useradmin/makeadmin/(?P<user_id>[^/]+)/$', user_make_admin, name='user_make_admin'),
(r'^useradmin/removeadmin/(?P<user_id>[^/]+)/$', user_remove_admin), url(r'^useradmin/removeadmin/(?P<user_id>[^/]+)/$', user_remove_admin, name='user_remove_admin'),
(r'^useradmin/info/(?P<email>[^/]+)/$', user_info), (r'^useradmin/info/(?P<email>[^/]+)/$', user_info),
(r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user), (r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user),
url(r'^useradmin/password/reset/(?P<user_id>[^/]+)/$', user_reset, name='user_reset'), url(r'^useradmin/password/reset/(?P<user_id>[^/]+)/$', user_reset, name='user_reset'),