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

Merge pull request #578 from haiwen/showDir_fix

Browse Source 
bugfix for 'showDir'
This commit is contained in:
xiez
2015-05-11 15:44:55 +08:00
parent 58023821b8 65c2abf8cb
commit 9ea129e9d2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/scripts/app/views/dir.js
View File

@@ -113,10 +113,10 @@ define([
var $el_con = _this.$('.repo-file-list-topbar, .repo-file-list').hide(); var $el_con = _this.$('.repo-file-list-topbar, .repo-file-list').hide();
var $error = _this.$('.error'); var $error = _this.$('.error');
var err_msg; var err_msg;
var decrypt_lib = false; var lib_need_decrypt = false;
if (response.responseText) { if (response.responseText) {
if (response.responseJSON.lib_need_decrypt) { if (response.responseJSON.lib_need_decrypt) {
decrypt_lib = true; lib_need_decrypt = true;
} else { } else {
err_msg = response.responseJSON.error; err_msg = response.responseJSON.error;
} }
@@ -127,13 +127,14 @@ define([
$error.html(err_msg).show(); $error.html(err_msg).show();
} }
if (decrypt_lib) { if (lib_need_decrypt) {
var form = $($('#repo-decrypt-form-template').html()); var form = $($('#repo-decrypt-form-template').html());
var decrypt_success = false; var decrypt_success = false;
form.modal({ form.modal({
containerCss: {'padding': '1px'}, containerCss: {'padding': '1px'},
onClose: function () { onClose: function () {
$.modal.close(); $.modal.close();
$el_con.show();
if (!decrypt_success) { if (!decrypt_success) {
app.router.navigate( app.router.navigate(
category + '/', // need to append '/' at end category + '/', // need to append '/' at end
@@ -161,7 +162,6 @@ define([
after_op_success: function() { after_op_success: function() {
decrypt_success = true; decrypt_success = true;
$.modal.close(); $.modal.close();
$el_con.show();
_this.showDir(category, repo_id, path); _this.showDir(category, repo_id, path);
} }
}); });