Browse Source

Merge pull request #863 in DESIGN/design from ~XIAOXIA/design:release/10.0 to release/10.0

* commit '695d04fb9d0a9a52ddcca3c5205e2c1cf30d9702':
  REPORT-16559 @xiaoxia 远程设计,开启模版版本保存,修改模版保存不会产生新版本
bugfix/10.0
xiaoxia 6 years ago
parent
commit
8cd6695e81
  1. 1
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java

1
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java

@ -63,6 +63,7 @@ public class FileVersionRowPanel extends JPanel {
public void actionPerformed(ActionEvent evt) {
if (JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Title"),
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
vcsEntity.setUsername(VcsHelper.getCurrentUsername());
WorkContext.getCurrent().get(VcsOperator.class).rollbackTo(vcsEntity);
FileVersionsPanel.getInstance().exitVcs(vcsEntity.getFilename());
}

Loading…
Cancel
Save