Changeset 86250 in vbox

Timestamp:

Sep 23, 2020 5:13:30 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UICloudProfileManager: Make sure provider/profile restrictions are always taken into account, they were forgotten on profile add/update calls.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager

Files:

• UICloudProfileManager.cpp (modified) (8 diffs)
• UICloudProfileManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -308 +308 @@
                 if (comCloudProfile.isOk())
                 {
+                    /* Acquire cloud profile manager restrictions: */
+                    const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
+
                     /* Update profile in the tree: */
                     UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, *pProviderItem, data);
+                    loadCloudProfile(comCloudProfile, restrictions, *pProviderItem, data);
                     updateItemForCloudProfile(data, true, pProfileItem);
 
@@ -395 +398 @@
                 else
                 {
+                    /* Acquire cloud profile manager restrictions: */
+                    const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
+
                     /* Add profile to the tree: */
                     UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, *pProviderItem, data);
+                    loadCloudProfile(comCloudProfile, restrictions, *pProviderItem, data);
                     createItemForCloudProfile(pProviderItem, data, true);
 
@@ -823 +829 @@
         /* Load provider data: */
         UIDataCloudProvider providerData;
-        loadCloudProvider(comCloudProvider, providerData);
-        const QString strProviderPath = QString("/%1").arg(providerData.m_strShortName);
-        providerData.m_fRestricted = restrictions.contains(strProviderPath);
+        loadCloudProvider(comCloudProvider, restrictions, providerData);
         createItemForCloudProvider(providerData, false);
 
@@ -840 +844 @@
             /* Load profile data: */
             UIDataCloudProfile profileData;
-            loadCloudProfile(comCloudProfile, providerData, profileData);
-            const QString strProfilePath = QString("/%1/%2").arg(providerData.m_strShortName).arg(profileData.m_strName);
-            profileData.m_fRestricted = restrictions.contains(strProfilePath);
+            loadCloudProfile(comCloudProfile, restrictions, providerData, profileData);
             createItemForCloudProfile(pItem, profileData, false);
         }
@@ -856 +858 @@
 
 void UICloudProfileManagerWidget::loadCloudProvider(const CCloudProvider &comProvider,
+                                                    const QStringList &restrictions,
                                                     UIDataCloudProvider &providerData)
 {
@@ -865 +868 @@
     if (comProvider.isOk())
         providerData.m_strName = comProvider.GetName();
+    const QString strProviderPath = QString("/%1").arg(providerData.m_strShortName);
+    providerData.m_fRestricted = restrictions.contains(strProviderPath);
     foreach (const QString &strSupportedPropertyName, comProvider.GetSupportedPropertyNames())
         providerData.m_propertyDescriptions[strSupportedPropertyName] = comProvider.GetPropertyDescription(strSupportedPropertyName);
@@ -874 +879 @@
 
 void UICloudProfileManagerWidget::loadCloudProfile(const CCloudProfile &comProfile,
+                                                   const QStringList &restrictions,
                                                    const UIDataCloudProvider &providerData,
                                                    UIDataCloudProfile &profileData)
@@ -883 +889 @@
     if (comProfile.isOk())
         profileData.m_strName = comProfile.GetName();
+    const QString strProfilePath = QString("/%1/%2").arg(providerData.m_strShortName).arg(profileData.m_strName);
+    profileData.m_fRestricted = restrictions.contains(strProfilePath);
 
     if (comProfile.isOk())

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.h

@@ -153 +153 @@
         /** Loads cloud stuff. */
         void loadCloudStuff();
-        /** Loads cloud @a comProvider data to passed @a providerData container. */
+        /** Loads cloud @a comProvider data to passed @a providerData container,
+          * using @a restrictions as hint. */
         void loadCloudProvider(const CCloudProvider &comProvider,
+                               const QStringList &restrictions,
                                UIDataCloudProvider &providerData);
-        /** Loads cloud @a comProfile data to passed @a profileData container, using @a providerData as hint. */
+        /** Loads cloud @a comProfile data to passed @a profileData container,
+          * using @a restrictions & @a providerData as hint. */
         void loadCloudProfile(const CCloudProfile &comProfile,
+                              const QStringList &restrictions,
                               const UIDataCloudProvider &providerData,
                               UIDataCloudProfile &profileData);