промежуточный. проход редактирования учетной записи админом
This commit is contained in:
18
.idea/workspace.xml
generated
18
.idea/workspace.xml
generated
@@ -7,27 +7,13 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" afterDir="false" />
|
||||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.form" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AdministrationWindow.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.form" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -345,6 +345,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
void ReceiveCredentialsDatabase() throws Exception{
|
void ReceiveCredentialsDatabase() throws Exception{
|
||||||
response.object = Utils_.fileToBytes(credentials_db.getFile());
|
response.object = Utils_.fileToBytes(credentials_db.getFile());
|
||||||
}
|
}
|
||||||
|
void EditUserAccount() throws Exception{
|
||||||
|
UserAccount new_object = (UserAccount) request.object;
|
||||||
|
credentials_db.UpdateWithCheck(new_object);
|
||||||
|
}
|
||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
protected void UnsafeSession() throws Exception {
|
protected void UnsafeSession() throws Exception {
|
||||||
@@ -381,6 +385,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
@Override
|
@Override
|
||||||
protected void Session() throws Exception {
|
protected void Session() throws Exception {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
|
case EditUserAccount:
|
||||||
|
EditUserAccount();
|
||||||
|
break;
|
||||||
case ReceiveCredentialsDatabase:
|
case ReceiveCredentialsDatabase:
|
||||||
ReceiveCredentialsDatabase();
|
ReceiveCredentialsDatabase();
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package _VisualDVM.ComponentsServer;
|
|||||||
import Common.Database.SQLITE.SQLiteDatabase;
|
import Common.Database.SQLITE.SQLiteDatabase;
|
||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
|
||||||
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
public class CredentialsDatabase extends SQLiteDatabase {
|
public class CredentialsDatabase extends SQLiteDatabase {
|
||||||
@@ -15,7 +16,7 @@ public class CredentialsDatabase extends SQLiteDatabase {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public PassCode_ getSynchronizePassCode() {
|
public PassCode_ getSynchronizePassCode() {
|
||||||
return null;
|
return PassCode.SynchronizeCredentials;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void DropUI() {
|
public void DropUI() {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
|
|||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import Common.Visual.Tables.ColumnInfo;
|
import Common.Visual.Tables.ColumnInfo;
|
||||||
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
|
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
|
||||||
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
@@ -49,6 +50,10 @@ public class UserAccountsForm extends DataSetControlForm<UserAccount> {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected DataMenuBar createMenuBar() {
|
protected DataMenuBar createMenuBar() {
|
||||||
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeCredentials);
|
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeCredentials, PassCode.EditUserAccount);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected DBObjectDialog getDialog() {
|
||||||
|
return new UserAccountDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
24
src/_VisualDVM/Passes/All/EditUserAccount.java
Normal file
24
src/_VisualDVM/Passes/All/EditUserAccount.java
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
package _VisualDVM.Passes.All;
|
||||||
|
import Common.Database.Database;
|
||||||
|
import Common.Passes.Pass;
|
||||||
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
|
import _VisualDVM.Global;
|
||||||
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
|
import _VisualDVM.Passes.Server.EditServerObject;
|
||||||
|
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
|
||||||
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
|
public class EditUserAccount extends EditServerObject<ComponentsServer,UserAccount> {
|
||||||
|
public EditUserAccount() {
|
||||||
|
super(Global.componentsServer, UserAccount.class);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected Database getDb() {
|
||||||
|
return Global.componentsServer.credentials_db;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void ServerAction() throws Exception {
|
||||||
|
Command(new SafeServerExchangeUnit(ServerCode.EditUserAccount, "", target));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -356,11 +356,14 @@ public enum PassCode implements PassCode_ {
|
|||||||
DetectSelectedTestsMinMaDim,
|
DetectSelectedTestsMinMaDim,
|
||||||
ConfirmEmail,
|
ConfirmEmail,
|
||||||
SynchronizeCredentials,
|
SynchronizeCredentials,
|
||||||
|
EditUserAccount
|
||||||
;
|
;
|
||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
|
case EditUserAccount:
|
||||||
|
return "Редактирование учётной записи";
|
||||||
case SynchronizeCredentials:
|
case SynchronizeCredentials:
|
||||||
return "Синхронизация учётных записей";
|
return "Синхронизация учётных записей";
|
||||||
case ConfirmEmail:
|
case ConfirmEmail:
|
||||||
|
|||||||
@@ -64,9 +64,12 @@ public enum ServerCode {
|
|||||||
ReplaceDVMPackageResults,
|
ReplaceDVMPackageResults,
|
||||||
DetectTestsMinMaxDim,
|
DetectTestsMinMaxDim,
|
||||||
GetUserAccountByKey,
|
GetUserAccountByKey,
|
||||||
GetUserAccountByEmail;
|
GetUserAccountByEmail,
|
||||||
|
EditUserAccount;
|
||||||
public String getDescription(){
|
public String getDescription(){
|
||||||
switch (this){
|
switch (this){
|
||||||
|
case EditUserAccount:
|
||||||
|
return "Редактирование учётной записи на сервере";
|
||||||
case ReceiveCredentialsDatabase:
|
case ReceiveCredentialsDatabase:
|
||||||
return "Скачивание базы учётных записей с сервера";
|
return "Скачивание базы учётных записей с сервера";
|
||||||
case GetUserAccountByEmail:
|
case GetUserAccountByEmail:
|
||||||
|
|||||||
Reference in New Issue
Block a user