fix лишней рассылки админам
This commit is contained in:
@@ -82,7 +82,7 @@ public class ComponentsForm extends DataSetControlForm<Component> {
|
||||
}
|
||||
}
|
||||
);
|
||||
MainModule_.instance.getPass(PassCode.PublishComponent).setControlsVisible(false);
|
||||
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(Global.mainModule.getAccount().isAdmin());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -105,8 +105,6 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
Utils_.bytesToFile(message_in.files.get(aName), f);
|
||||
innerFiles.put(aName, f);
|
||||
}
|
||||
Vector<String> targets_ = new Vector<>(message_in.targets);
|
||||
Utils.addDefaultMails(targets_);
|
||||
//------------------------------
|
||||
Session session = Session.getDefaultInstance(props,
|
||||
new Authenticator() {
|
||||
@@ -117,7 +115,7 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
Constants.MailPassword);
|
||||
}
|
||||
});
|
||||
for (String target : targets_) {
|
||||
for (String target : message_in.targets) {
|
||||
boolean done = false;
|
||||
int attempts = 5;
|
||||
while (!done && (attempts > 0)) {
|
||||
|
||||
@@ -108,6 +108,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
}
|
||||
@Override
|
||||
protected void checkTargets(EmailMessage message_in) {
|
||||
System.out.println("unckeched targets = "+String.join(" ", message_in.targets));
|
||||
Vector<String> checkedTargets = new Vector<>();
|
||||
for (String email : message_in.targets) {
|
||||
if (db.subscribers.containsKey(email)) {
|
||||
@@ -118,6 +119,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
} else checkedTargets.add(email); //если почта не зарегана значит это мейл с регистрацией.
|
||||
}
|
||||
message_in.targets = checkedTargets;
|
||||
System.out.println("checked targets = "+String.join(" ", message_in.targets));
|
||||
}
|
||||
@Override
|
||||
public void afterDeleteAction(DBObject object) throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user