перенос проходов в центральный модуль
This commit is contained in:
@@ -27,21 +27,21 @@ public class InitialiseUser extends Pass {
|
||||
protected void body() throws Exception {
|
||||
switch (Global.mainModule.getMachine().type) {
|
||||
case Local:
|
||||
passes.get(PassCode.LocalInitaliseUser).Do();
|
||||
Global.mainModule.getPass(PassCode.LocalInitaliseUser).Do();
|
||||
break;
|
||||
case Server:
|
||||
case MVS_cluster:
|
||||
if (passes.get(PassCode.CheckRemoteWorkspace).Do()) {
|
||||
SubscriberWorkspace workspace = (SubscriberWorkspace) passes.get(PassCode.CheckRemoteWorkspace).target;
|
||||
if ( Global.mainModule.getPass(PassCode.CheckRemoteWorkspace).Do()) {
|
||||
SubscriberWorkspace workspace = (SubscriberWorkspace) Global.mainModule.getPass(PassCode.CheckRemoteWorkspace).target;
|
||||
if (workspace == null) {
|
||||
if (passes.get(PassCode.RemoteInitialiseUser).Do()){
|
||||
if ( Global.mainModule.getPass(PassCode.RemoteInitialiseUser).Do()){
|
||||
workspace = new SubscriberWorkspace();
|
||||
workspace.email=Global.mainModule.getAccount().email;
|
||||
workspace.URL=Global.mainModule.getMachine().getURL();
|
||||
workspace.login=Global.mainModule.getUser().login;
|
||||
workspace.path=((RemoteFile) passes.get(PassCode.RemoteInitialiseUser).target).full_name;
|
||||
workspace.path=((RemoteFile) Global.mainModule.getPass(PassCode.RemoteInitialiseUser).target).full_name;
|
||||
//---
|
||||
if (passes.get(PassCode.PublishRemoteWorkspace).Do(workspace)) {
|
||||
if ( Global.mainModule.getPass(PassCode.PublishRemoteWorkspace).Do(workspace)) {
|
||||
Global.mainModule.getUser().workspace = workspace.path;
|
||||
Global.mainModule.getUser().state = UserState.ready_to_work;
|
||||
Global.mainModule.getDb().Update(Global.mainModule.getUser());
|
||||
|
||||
Reference in New Issue
Block a user