@@ -45,7 +45,7 @@
{% endif %}
{% if repo.props.share_type == 'public' %}
{% if not org %}
-
+
{% else %}
{% endif %}
@@ -64,6 +64,7 @@
{% block extra_script %}{{block.super}}
{% endblock %}
-
diff --git a/seahub/templates/sysadmin/sys_repo_trash.html b/seahub/templates/sysadmin/sys_repo_trash.html
index e90f061bbf..0c879dda87 100644
--- a/seahub/templates/sysadmin/sys_repo_trash.html
+++ b/seahub/templates/sysadmin/sys_repo_trash.html
@@ -59,21 +59,25 @@
{% if search_owner %}
addConfirmTo($('#repo-trash-clear'), {
'title':"{% trans 'Delete Library By Owner' %}",
- 'con':"{% trans "Are you sure you want to delete all %s's libraries?" %}"
+ 'con':"{% trans "Are you sure you want to delete all %s's libraries?" %}",
+ 'post': true // post request
});
{% else %}
addConfirmTo($('#repo-trash-clear'), {
'title':"{% trans 'Clear Trash' %}",
- 'con':"{% trans "Are you sure you want to clear trash?" %}"
+ 'con':"{% trans "Are you sure you want to clear trash?" %}",
+ 'post': true // post request
});
{% endif %}
addConfirmTo($('.repo-restore-btn'), {
'title':"{% trans 'Restore Library' %}",
- 'con':"{% trans "Are you sure you want to restore %s?" %}"
+ 'con':"{% trans "Are you sure you want to restore %s?" %}",
+ 'post': true // post request
});
addConfirmTo($('.repo-delete-btn'), {
'title':"{% trans 'Delete Library' %}",
- 'con':"{% trans "Are you sure you want to delete %s completely?" %}"
+ 'con':"{% trans "Are you sure you want to delete %s completely?" %}",
+ 'post': true // post request
});
{% endblock %}
diff --git a/seahub/templates/sysadmin/sys_virus_scan_records.html b/seahub/templates/sysadmin/sys_virus_scan_records.html
index 7f0da03f25..396d405ddf 100644
--- a/seahub/templates/sysadmin/sys_virus_scan_records.html
+++ b/seahub/templates/sysadmin/sys_virus_scan_records.html
@@ -20,7 +20,7 @@
{{ r.file_path }}
{% if not r.has_handle %}
- {% trans "Delete" %}
+ {% trans "Delete" %}
{% else %}
{% trans "Handled" %}
{% endif %}
@@ -35,6 +35,22 @@
{% block extra_script %}
{% endblock %}
diff --git a/seahub/templates/sysadmin/useradmin_js.html b/seahub/templates/sysadmin/useradmin_js.html
index c17f6545b6..38c2c44cf8 100644
--- a/seahub/templates/sysadmin/useradmin_js.html
+++ b/seahub/templates/sysadmin/useradmin_js.html
@@ -15,8 +15,9 @@ addConfirmTo($('.revoke-admin-btn'), {
'post': true // post request
});
addConfirmTo($('.unset-trial'), {
- 'title':"{% trans "Remove Trial" %}",
- 'con':"{% trans "Are you sure you want to remove trial for %s ?" %}"
+ 'title':"{% trans "Remove Trial" %}",
+ 'con':"{% trans "Are you sure you want to remove trial for %s ?" %}",
+ 'post': true // post request
});
$('tr:gt(0)').hover(
@@ -35,26 +36,28 @@ $('.user-status-select, .user-role-select').change(function() {
var select = $(this),
select_val = select.val(),
uid = select.parents('tr').attr('data-userid'),
- url;
+ url, data;
if (select.hasClass('user-status-select')) {
- url = "{{ SITE_ROOT }}useradmin/toggle_status/" + uid + "/?s=" + select_val;
+ url = "{{ SITE_ROOT }}useradmin/toggle_status/" + uid + "/";
+ data = {'s': select_val};
} else {
- url = "{{ SITE_ROOT }}useradmin/toggle_role/" + uid + "/?r=" + select_val;
+ url = "{{ SITE_ROOT }}useradmin/toggle_role/" + uid + "/";
+ data = {'r': select_val};
}
+ if (select_val == 1) {
+ // show activating popup
+ $('#activate-msg').modal();
+ $('#simplemodal-container').css({'height':'auto'});
+ }
$.ajax({
url: url,
- type: 'GET',
+ type: 'POST',
dataType: 'json',
+ data: data,
cache: false,
- beforeSend: function() {
- if (select_val == 1) {
- // show activating popup
- $('#activate-msg').modal();
- $('#simplemodal-container').css({'height':'auto'});
- }
- },
+ beforeSend: prepareCSRFToken,
success: function(data) {
if (data['email_sent']) {
feedback("{% trans "Edit succeeded, an email has been sent." %}", 'success');
diff --git a/seahub/templates/sysadmin/userinfo.html b/seahub/templates/sysadmin/userinfo.html
index a0cb0fadec..ca847107fb 100644
--- a/seahub/templates/sysadmin/userinfo.html
+++ b/seahub/templates/sysadmin/userinfo.html
@@ -171,7 +171,7 @@