сокрытие настроек от пользователей если недостаточно прав. например синхронизация тестирования не видима ролям ниже разрабов

This commit is contained in:
2025-02-28 19:12:32 +03:00
parent 61d8670416
commit 33f3d615da
4 changed files with 16 additions and 10 deletions

9
.idea/workspace.xml generated
View File

@@ -8,15 +8,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Properties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -1,6 +1,6 @@
{ {
"Email": "vmk-post@yandex.ru", "Email": "nataliku2@yandex.ru",
"Name": "M", "Name": "Test",
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": false, "OfferRegistrationOnStart": false,
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",

View File

@@ -86,4 +86,9 @@ public class Properties {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
public void setControlVisible(String settingName, boolean flag){
if (controls.containsKey(settingName)){
controls.get(settingName).setVisible(flag);
}
}
} }

View File

@@ -106,6 +106,8 @@ public class MainUI extends UIModule_ {
getMainWindow().SwitchAdministrationTab(false); getMainWindow().SwitchAdministrationTab(false);
getTestingMenuBar().showServerAdminLabel(false); getTestingMenuBar().showServerAdminLabel(false);
getMainWindow().getCallbackWindow().showNoBugReports(); getMainWindow().getCallbackWindow().showNoBugReports();
Global.normalProperties.setControlVisible("AutoBugReportsLoad", false);
Global.normalProperties.setControlVisible("AutoTestsLoad", false);
}; };
void showUserRights(){ void showUserRights(){
Global.mainModule.SetUserPassesAccess(); Global.mainModule.SetUserPassesAccess();
@@ -113,6 +115,8 @@ public class MainUI extends UIModule_ {
getMainWindow().SwitchAdministrationTab(false); getMainWindow().SwitchAdministrationTab(false);
getTestingMenuBar().showServerAdminLabel(false); getTestingMenuBar().showServerAdminLabel(false);
getMainWindow().getCallbackWindow().showMyOnlyBugReports(); getMainWindow().getCallbackWindow().showMyOnlyBugReports();
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
Global.normalProperties.setControlVisible("AutoTestsLoad", false);
}; };
void showDeveloperRights(){ void showDeveloperRights(){
Global.mainModule.SetDeveloperPassesAccess(); Global.mainModule.SetDeveloperPassesAccess();
@@ -120,6 +124,8 @@ public class MainUI extends UIModule_ {
getMainWindow().SwitchAdministrationTab(false); getMainWindow().SwitchAdministrationTab(false);
getTestingMenuBar().showServerAdminLabel(false); getTestingMenuBar().showServerAdminLabel(false);
getMainWindow().getCallbackWindow().showAllBugreports(); getMainWindow().getCallbackWindow().showAllBugreports();
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
Global.normalProperties.setControlVisible("AutoTestsLoad", true);
} }
void showAdminRights(){ void showAdminRights(){
Global.mainModule.SetAdminPassesAccess(); Global.mainModule.SetAdminPassesAccess();
@@ -127,6 +133,8 @@ public class MainUI extends UIModule_ {
getMainWindow().SwitchAdministrationTab(true); getMainWindow().SwitchAdministrationTab(true);
getTestingMenuBar().showServerAdminLabel(true); getTestingMenuBar().showServerAdminLabel(true);
getMainWindow().getCallbackWindow().showAllBugReportsAdmin(); //метод избыточный. возможно. getMainWindow().getCallbackWindow().showAllBugReportsAdmin(); //метод избыточный. возможно.
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
Global.normalProperties.setControlVisible("AutoTestsLoad", true);
}; };
public void ShowAccount(){ public void ShowAccount(){
getMainWindow().getCallbackWindow().ShowAccountInfo(); getMainWindow().getCallbackWindow().ShowAccountInfo();