M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

++

Browse Source 
убирание джсон запакованных полей у баг репортов
This commit is contained in:
02090095
2025-03-27 15:31:26 +03:00
parent dcdbaa83cf
commit 7178ecbc9c
19 changed files with 43 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/_VisualDVM/Passes/All/AddBugReport.java
View File

@@ -45,7 +45,6 @@ public class AddBugReport extends AddObjectPass<BugReport> {
target.project_version = "";
target.visualiser_version = Global.visualiser.version;
target.sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
target.packedSettingsJson = "";
target.percentage = 0;
target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
target.date = new Date().getTime();

6
src/_VisualDVM/Passes/All/PublishBugReport.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
@@ -10,7 +9,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.Repository.EmailMessage;
import java.io.File;
import java.util.Date;
public class PublishBugReport extends PublishServerObject<ComponentsServer, BugReport> {
public PublishBugReport() {
@@ -21,7 +19,7 @@ public class PublishBugReport extends PublishServerObject<ComponentsServer, BugR
return "/Common/icons/Publish.png";
}
@Override
protected boolean canStart(Object... args) throws Exception{
protected boolean canStart(Object... args) throws Exception {
if (Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
target = Global.componentsServer.db.bugReports.getUI().getCurrent();
if (!target.state.equals(BugReportState.draft)) {
@@ -53,10 +51,8 @@ public class PublishBugReport extends PublishServerObject<ComponentsServer, BugR
"Обнаружена ошибка " + Utils_.Brackets(target.id),
target.getNewMailText()
);
/*
Global.mainModule.getPass(PassCode.Email).Do(
message,
Global.componentsServer.db.recipients.getSelectedMails());
*/
}
}

10
src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
View File

@@ -1,7 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson;
import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.Recipient.Recipient;
@@ -20,17 +18,17 @@ public class SaveBugReportRecipients extends EditServerObject<ComponentsServer,
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (server.db.bugReports.getUI().CheckCurrent(Log)){
if (server.db.bugReports.getUI().CheckCurrent(Log)) {
target = server.db.bugReports.getUI().getCurrent();
target.recipients = new Vector<>();
for (Recipient recipient: server.db.recipients.getUI().getSelectedItems()){
for (Recipient recipient : server.db.recipients.getUI().getSelectedItems()) {
target.recipients.add(new BugReportRecipient(recipient.email));
}
switch (target.state){
switch (target.state) {
case draft:
break;
default:
for (BugReportRecipient recipient: target.recipients)
for (BugReportRecipient recipient : target.recipients)
recipient.bugreport_id = target.id;
target.change_date = new Date().getTime();
return true;