дополнение безопасности. не везде был сделан режим чтения
This commit is contained in:
14
.idea/workspace.xml
generated
14
.idea/workspace.xml
generated
@@ -8,7 +8,19 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
||||
@@ -559,6 +559,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
|
||||
} else {
|
||||
title += "просмотр";
|
||||
dialog.SetReadonly();
|
||||
dialog.BlockButtons();
|
||||
}
|
||||
return dialog.ShowDialog(title, object);
|
||||
}
|
||||
|
||||
@@ -108,6 +108,10 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
|
||||
}
|
||||
getContentPane().add(buttonsPane, BorderLayout.SOUTH);
|
||||
}
|
||||
public void BlockButtons(){
|
||||
btnOK.setVisible(false);
|
||||
btnCancel.setVisible(false);
|
||||
}
|
||||
public boolean isOnTop() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ public class PauseDVMPackage extends ConnectionPass<DVMPackage> {
|
||||
}
|
||||
machine =target.getMachine();
|
||||
user = target.getUser();
|
||||
return true;
|
||||
return Global.mainModule.getAccount().CheckAuthorship(target.sender_address,Log);
|
||||
}
|
||||
@Override
|
||||
protected void ServerAction() throws Exception {
|
||||
|
||||
@@ -27,7 +27,7 @@ public class ResumeDVMPackage extends ConnectionPass<DVMPackage> {
|
||||
}
|
||||
machine = target.getMachine();
|
||||
user = target.getUser();
|
||||
return true;
|
||||
return Global.mainModule.getAccount().CheckAuthorship(target.sender_address,Log);
|
||||
}
|
||||
@Override
|
||||
protected void ServerAction() throws Exception {
|
||||
|
||||
@@ -33,5 +33,6 @@ public class DVMConfigurationDialog extends DBObjectDialog<DVMConfiguration, DVM
|
||||
fields.tfName.setEnabled(false);
|
||||
fields.sCompilationMaxtime.setEnabled(false);
|
||||
fields.sRunMaxtime.setEnabled(false);
|
||||
fields.sKernels.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,7 +101,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
|
||||
if (Global.mainModule.getAccount().CheckRegistered(null)) {
|
||||
switch (Global.mainModule.getAccount().role) {
|
||||
case Admin:
|
||||
case Developer:
|
||||
return true;
|
||||
default:
|
||||
return (Global.mainModule.getAccount().email.equals(object.sender_address));
|
||||
|
||||
@@ -56,5 +56,10 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
|
||||
fields.sMaxDimProc.setEnabled(false);
|
||||
fields.cbCube.setEnabled(false);
|
||||
fields.sMaxProc.setEnabled(false);
|
||||
fields.bAddFlags.setEnabled(false);
|
||||
fields.bAddEnvironments.setEnabled(false);
|
||||
fields.bDeleteEnvironment.setEnabled(false);
|
||||
fields.bDeleteFlags.setEnabled(false);
|
||||
fields.cbDvmStat.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,10 +21,10 @@ public class DVMSettingsFields implements DialogFields {
|
||||
public JTextField tfEnvironments;
|
||||
public JCheckBox cbDvmStat;
|
||||
private JPanel content;
|
||||
private JButton bAddFlags;
|
||||
private JButton bAddEnvironments;
|
||||
private JButton bDeleteFlags;
|
||||
private JButton bDeleteEnvironment;
|
||||
public JButton bAddFlags;
|
||||
public JButton bAddEnvironments;
|
||||
public JButton bDeleteFlags;
|
||||
public JButton bDeleteEnvironment;
|
||||
public DVMSettingsFields() {
|
||||
sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
|
||||
sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
|
||||
|
||||
@@ -94,7 +94,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
|
||||
if (Global.mainModule.getAccount().CheckRegistered(null)) {
|
||||
switch (Global.mainModule.getAccount().role) {
|
||||
case Admin:
|
||||
case Developer:
|
||||
return true;
|
||||
default:
|
||||
return (Global.mainModule.getAccount().email.equals(object.sender_address));
|
||||
|
||||
@@ -29,6 +29,6 @@ public class SapforConfigurationDialog extends DBObjectDialog<SapforConfiguratio
|
||||
@Override
|
||||
public void SetReadonly() {
|
||||
fields.tfName.setEnabled(false);
|
||||
fields.sTransformationMaxtime.setEnabled(false);
|
||||
fields.sKernels.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
|
||||
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
|
||||
|
||||
@@ -128,4 +129,16 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
|
||||
Global.testingServer.db.sapforPackages.getUI().ClearSelection();
|
||||
}
|
||||
}
|
||||
@Override
|
||||
protected boolean isObjectEditable(SapforConfiguration object) {
|
||||
if (Global.mainModule.getAccount().CheckRegistered(null)) {
|
||||
switch (Global.mainModule.getAccount().role) {
|
||||
case Admin:
|
||||
return true;
|
||||
default:
|
||||
return (Global.mainModule.getAccount().email.equals(object.sender_address));
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||
|
||||
import javax.swing.*;
|
||||
public class SapforSettingsDialog extends DBObjectDialog<SapforSettings, SapforSettingsFields> {
|
||||
public SapforSettingsDialog() {
|
||||
super(SapforSettingsFields.class);
|
||||
@@ -39,5 +41,10 @@ public class SapforSettingsDialog extends DBObjectDialog<SapforSettings, SapforS
|
||||
@Override
|
||||
public void SetReadonly() {
|
||||
fields.tfName.setEnabled(false);
|
||||
fields.cbFREE_FORM.setEnabled(false);
|
||||
fields.cbKEEP_SPF_DIRECTIVES.setEnabled(false);
|
||||
fields.cbSTATIC_SHADOW_ANALYSIS.setEnabled(false);
|
||||
fields.cbKEEP_DVM_DIRECTIVES.setEnabled(false);
|
||||
fields.sMAX_SHADOW_WIDTH.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,9 @@ import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Tables.ColumnInfo;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -52,4 +54,16 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
|
||||
protected DBObjectDialog getDialog() {
|
||||
return new SapforSettingsDialog();
|
||||
}
|
||||
@Override
|
||||
protected boolean isObjectEditable(SapforSettings object) {
|
||||
if (Global.mainModule.getAccount().CheckRegistered(null)) {
|
||||
switch (Global.mainModule.getAccount().role) {
|
||||
case Admin:
|
||||
return true;
|
||||
default:
|
||||
return (Global.mainModule.getAccount().email.equals(object.sender_address));
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user