Merge branch 'fix/checkManage2' into 'release'

Fix/check manage2【数据中心】修复数据中心打开报错问题

See merge request o2oa/o2oa!426

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java

@@ -19,6 +19,8 @@ import com.x.base.core.project.tools.Crypto;
 import com.x.organization.assemble.personal.Business;
 import com.x.organization.core.entity.Person;
 
+import com.x.base.core.project.annotation.FieldDescribe;
+
 class ActionChangePassword extends ActionBase {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionChangePassword.class);
@@ -84,8 +86,13 @@ class ActionChangePassword extends ActionBase {
 
 	public static class Wi extends GsonPropertyObject {
 
+		@FieldDescribe("原密码")
 		private String oldPassword;
+
+		@FieldDescribe("新密码")
 		private String newPassword;
+
+		@FieldDescribe("确认新密码")
 		private String confirmPassword;
 
 		public String getOldPassword() {

o2web/gulpfile.js

@@ -7,7 +7,7 @@ var gulp = require('gulp'),
     gulpif = require('gulp-if'),
     minimist = require('minimist'),
     ftp = require('gulp-ftp'),
-    sftp = require('gulp-sftp'),
+    sftp = require('gulp-sftp-up4'),
     JSFtp = require('jsftp'),
     gutil = require('gulp-util'),
     fs = require("fs");

o2web/source/x_component_process_ApplicationExplorer/Main.js

@@ -623,7 +623,7 @@ MWF.xApplication.process.ApplicationExplorer.Application = new Class({
 	checkManage: function(){
 		if (this.app.control.canManage) return true;
 		if (this.app.control.canCreate && (this.data.creatorPerson==layout.desktop.session.user.name)) return true;
-		if (this.data.controllerList.indexOf(layout.desktop.session.user.distinguishedName)!==-1) return true;
+		//if (this.data.controllerList.indexOf(layout.desktop.session.user.distinguishedName)!==-1) return true;
 		return false;
 	},