no message
This commit is contained in:
@@ -34,14 +34,16 @@ public class BugReportsDatabase extends SQLiteDatabase {
|
||||
for (BugReport draft : drafts)
|
||||
Delete(draft);
|
||||
}
|
||||
@Override
|
||||
public void DropUI() {
|
||||
SaveLastSelections();
|
||||
super.DropUI();
|
||||
bugReports.ClearUI();
|
||||
subscribers.ClearUI();
|
||||
workspaces.ClearUI();
|
||||
}
|
||||
@Override
|
||||
public void ResetUI() {
|
||||
bugReports.ShowUI();
|
||||
RestoreLastSelections();
|
||||
super.ResetUI();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,7 +141,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
Email(message, address);
|
||||
}
|
||||
}
|
||||
//--
|
||||
}
|
||||
@Override
|
||||
public void ActivateDB() {
|
||||
super.ActivateDB();
|
||||
try {
|
||||
credentials_db = new CredentialsDatabase();
|
||||
credentials_db.Activate();
|
||||
@@ -339,6 +342,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
}
|
||||
response.object = account;
|
||||
}
|
||||
void ReceiveCredentialsDatabase() throws Exception{
|
||||
response.object = Utils_.fileToBytes(credentials_db.getFile());
|
||||
}
|
||||
//--
|
||||
@Override
|
||||
protected void UnsafeSession() throws Exception {
|
||||
@@ -375,6 +381,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
@Override
|
||||
protected void Session() throws Exception {
|
||||
switch (code) {
|
||||
case ReceiveCredentialsDatabase:
|
||||
ReceiveCredentialsDatabase();
|
||||
break;
|
||||
case ReceiveAllArchives:
|
||||
ReceiveAllArchives();
|
||||
break;
|
||||
|
||||
@@ -17,4 +17,14 @@ public class CredentialsDatabase extends SQLiteDatabase {
|
||||
public PassCode_ getSynchronizePassCode() {
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public void DropUI() {
|
||||
super.DropUI();
|
||||
userAccounts.ClearUI();
|
||||
}
|
||||
@Override
|
||||
public void ResetUI() {
|
||||
userAccounts.ShowUI();
|
||||
super.ResetUI();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
package _VisualDVM.ComponentsServer.UserAccount.UI;
|
||||
import Common.Database.Tables.DataSet;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Tables.ColumnInfo;
|
||||
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
|
||||
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
|
||||
import javax.swing.*;
|
||||
public class UserAccountsForm extends DataSetControlForm<UserAccount> {
|
||||
public UserAccountsForm(DataSet<?, UserAccount> dataSource_in, JPanel mountPanel_in) {
|
||||
super(dataSource_in, mountPanel_in);
|
||||
}
|
||||
@Override
|
||||
protected void createColumns() {
|
||||
AddColumns(
|
||||
new ColumnInfo<UserAccount>("Имя") {
|
||||
@Override
|
||||
public Object getFieldAt(UserAccount object) {
|
||||
return object.name;
|
||||
}
|
||||
},
|
||||
new ColumnInfo<UserAccount>("Почта") {
|
||||
@Override
|
||||
public Object getFieldAt(UserAccount object) {
|
||||
return object.email;
|
||||
}
|
||||
},
|
||||
new ColumnInfo<UserAccount>("Роль") {
|
||||
@Override
|
||||
public Object getFieldAt(UserAccount object) {
|
||||
return object.role.getDescription();
|
||||
}
|
||||
@Override
|
||||
public boolean isVisible() {
|
||||
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
|
||||
}
|
||||
},
|
||||
new ColumnInfo<UserAccount>("Рассылка") {
|
||||
@Override
|
||||
public Object getFieldAt(UserAccount object) {
|
||||
return (object.subscribe_active == 0) ? "выключена" : "включена";
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
@Override
|
||||
protected DataMenuBar createMenuBar() {
|
||||
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeCredentials);
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,8 @@ import com.sun.org.glassfish.gmbal.Description;
|
||||
public class UserAccount extends iDBObject {
|
||||
public String name = "";
|
||||
public String email = "";
|
||||
@Description("DEFAULT ''")
|
||||
public String telegram_name="";
|
||||
@Description("DEFAULT 1")
|
||||
public int subscribe_active = 1;
|
||||
public String security_key = "";
|
||||
@@ -25,6 +27,7 @@ public class UserAccount extends iDBObject {
|
||||
UserAccount src_ = (UserAccount) src;
|
||||
name = src_.name;
|
||||
email = src_.email;
|
||||
telegram_name=src_.telegram_name;
|
||||
subscribe_active=src_.subscribe_active;
|
||||
security_key = src_.security_key;
|
||||
role = src_.role;
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package _VisualDVM.ComponentsServer.UserAccount;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm;
|
||||
|
||||
import javax.swing.*;
|
||||
public class UserAccountsDBTable extends iDBTable<UserAccount> {
|
||||
public UserAccountsDBTable() {
|
||||
super(UserAccount.class);
|
||||
@@ -18,4 +22,16 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||
return new UserAccountsForm(this, mountPanel);
|
||||
}
|
||||
@Override
|
||||
public String getSingleDescription() {
|
||||
return "учётная запись";
|
||||
}
|
||||
@Override
|
||||
public String getPluralDescription() {
|
||||
return "учётные записи";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user