Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/webapp/static/pages/scripts/pageLogs.js

@@ -50,8 +50,8 @@ $(document).ready(function() {
 	});
 	
 	// 添加由配置界面跳转到日志查询界面后的返回按钮
-	var cfgId = $("input[name=cfgId]").val();
-	if(cfgId != undefined && cfgId != ''){
+	var isLogTotalSearch = $("#isLogTotalSearch").val();
+	if(isLogTotalSearch != undefined && isLogTotalSearch != ''){
 		$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>"+$.validator.messages.go_back+"</button>");
 	}
 });