DataStore improvements.

3 files changed, 5 insertions, 5 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs
index ef708afd3..d8bd8791a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs
@@ -120,7 +120,7 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
                 return;
             }
 
-            var vm = await NotificationProvider.ShowDialog<DataStoreItemEditDialogViewVM>(new DataStoreItemEditDialogViewVM() { Item = item, EnableTypeChange = !item.IsGlobal });
+            var vm = await NotificationProvider.ShowDialog<DataStoreItemEditDialogViewVM>(new DataStoreItemEditDialogViewVM() { Item = item, EnableTypeChange = !item.IsGlobal && item.GlobalItem == null });
 
             if (vm.DialogResult)
             {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs
index 19617c347..dd2430415 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs
@@ -21,7 +21,7 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
 
         public enum NavigationView
         {
-            ConfigurationView,
+            SettingsView,
             DataStoreView,
         }
 
@@ -58,7 +58,7 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
 
         public void OnNavigatedToWithObject(NavigationObject obj)
         {
-            SelectedView = NavigationView.ConfigurationView;
+            SelectedView = NavigationView.SettingsView;
             LoadMachine(obj.MachineGuid);
         }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/ConfigurationViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/SettingsViewVM.cs
index 0c4b3a0f5..ed2cbd714 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/ConfigurationViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/SettingsViewVM.cs
@@ -15,7 +15,7 @@ using static Tango.FSE.BL.Services.MachineConfigurationService;
 
 namespace Tango.FSE.MachineConfiguration.ViewModels
 {
-    public class ConfigurationViewVM : FSEViewModel
+    public class SettingsViewVM : FSEViewModel
     {
         [TangoInject]
         private IRemoteSqlProvider RemoteSqlProvider { get; set; }
@@ -45,7 +45,7 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
             set { _selectedSite = value; RaisePropertyChangedAuto(); }
         }
 
-        public ConfigurationViewVM()
+        public SettingsViewVM()
         {
             RegisterForMessage<EditingCompositionLoadedMessage>(OnEditingCompositionLoaded);
             SaveCommand = new RelayCommand(SaveConfiguration);