Compare commits

..

No commits in common. "5e7d398b490c37d61d6a2378f62a21a5b45a8c45" and "7c9841cee9411886dfe20f3103f24ec4865d41c0" have entirely different histories.

2 changed files with 2 additions and 8 deletions

View File

@ -20,7 +20,7 @@
"jquery-slimscroll": "~1.3.8",
"jquery.cookie": "~1.4.1",
"Sortable": "~1.10.0",
"nice-validator": "karsonzhang/fastadmin-nicevalidator#~1.1.6",
"nice-validator": "~1.1.1",
"art-template": "~3.1.3",
"bootstrap-daterangepicker": "~2.1.25",
"fastadmin-citypicker": "~1.3.1",

View File

@ -175,7 +175,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie']
});
return res;
},
dataType: 'jsonp',
dataType: 'json',
templateView: false,
clickToSelect: false,
search: true,
@ -245,16 +245,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie']
$(document).on("mousedown", "#faupload-addon", function (e) {
var userinfo = Controller.api.userinfo.get();
var uid = userinfo ? userinfo.id : 0;
var uploadBtn = Upload.list['faupload-addon'];
if (parseInt(uid) === 0) {
uploadBtn.disable();
$(".btn-userinfo").trigger("click");
return false;
} else {
if (uploadBtn.disabled) {
uploadBtn.enable();
}
}
});
});