Исправлено отображение данных перед установкой на flash

pym/install/variables/autopartition.py

@@ -502,6 +502,17 @@ class VariableClAutopartitionSet(Variable):
         return [("off",_("Use the current partitions")),
                 ("on",_("Autopartition"))]
 
+
+class VariableClAutopartitionBriefSet(VariableClAutopartitionSet):
+
+    def get(self):
+        return self.Get('cl_autopartition_set')
+
+    def uncompatible(self):
+        if self.Get('os_install_root_type') == 'flash':
+            return \
+                _("This option not used for Flash install")
+
 class VariableClAutopartitionScheme(AutopartitionHelper,Variable,AutoPartition):
     """
     Autopartition scheme

pym/install/variables/system.py

@@ -353,7 +353,7 @@ class VariableClAutologin(UserHelper,Variable):
                     _("The autologin is not available with domain workstations")
         except DataVarsError:
             pass
-        return ""
+        return UserHelper.uncompatible(self)
 
 class VariableClInstallAutoupdateSet(Variable):
     """
@@ -662,13 +662,25 @@ class VariableOsInstallUefiSet(Variable):
 
     def uncompatible(self):
         """
-        Network setting up unavailable for flash installation
+        Uncompatible with autopartition
         """
         if self.Get('cl_autopartition_set') == "on":
             return \
                 _("The layout is not available with autopartitioning")
+        if self.Get('os_install_root_type') == 'flash':
+            return \
+                _("This option not used for Flash install")
         return ""
 
+class VariableOsInstallUefiBriefSet(VariableOsInstallUefiSet):
+    def uncompatible(self):
+        if self.Get('os_install_root_type') == 'flash':
+            return _("This option not used for Flash install")
+        return ""
+    
+    def get(self):
+        return self.Get('os_install_uefi_set')
+
 class VariableOsInstallGrubTerminal(Variable):
     """
     Gfxmode
@@ -759,35 +771,35 @@ class FlashUncompatible:
 try:
     import calculate.update.variables.update as update
 
-    class VariableClInstallAutocheckSet(update.VariableClUpdateAutocheckSet,
-                                        FlashUncompatible):
+    class VariableClInstallAutocheckSet(FlashUncompatible,
+                                        update.VariableClUpdateAutocheckSet):
         def get(self):
             return self.Get('update.cl_update_autocheck_set')
 
-    class VariableClInstallAutocheckInterval(
-            update.VariableClUpdateAutocheckInterval, FlashUncompatible):
+    class VariableClInstallAutocheckInterval(FlashUncompatible,
+            update.VariableClUpdateAutocheckInterval):
         def get(self):
             return self.Get('update.cl_update_autocheck_interval')
 
-    class VariableClInstallCleanpkgSet(
-        update.VariableClUpdateCleanpkgSet, FlashUncompatible):
+    class VariableClInstallCleanpkgSet(FlashUncompatible,
+        update.VariableClUpdateCleanpkgSet):
         def get(self):
             return self.Get('update.cl_update_cleanpkg_set')
 
-    class VariableClInstallOtherSet(
-        update.VariableClUpdateOtherSet, FlashUncompatible):
+    class VariableClInstallOtherSet(FlashUncompatible,
+        update.VariableClUpdateOtherSet):
         def get(self):
             return self.Get('update.cl_update_other_set')
 
 except ImportError:
-    class VariableClInstallAutocheckSet(Variable, FlashUncompatible):
+    class VariableClInstallAutocheckSet(FlashUncompatible, Variable):
         value = "off"
 
-    class VariableClInstallAutocheckInterval(Variable, FlashUncompatible):
+    class VariableClInstallAutocheckInterval(FlashUncompatible, Variable):
         value = ""
 
-    class VariableClInstallCleanpkgSet(Variable, FlashUncompatible):
+    class VariableClInstallCleanpkgSet(FlashUncompatible, Variable):
         value = "off"
 
-    class VariableClInstallOtherSet(Variable, FlashUncompatible):
+    class VariableClInstallOtherSet(FlashUncompatible, Variable):
         value = "off"

pym/install/wsdl_install.py

@@ -72,6 +72,8 @@ class Wsdl(WsdlBase):
                         'cl_image_new_only')),
             lambda group:group(_("Allocate drive space"),
                 normal=('cl_autopartition_set',),
+                hide=('cl_autopartition_set',),
+                brief=('cl_autopartition_brief_set',),
                 expert=('cl_autopartition_scheme',
                         'cl_autopartition_table','cl_autopartition_root_size',
                         'cl_autopartition_swap_size',
@@ -80,8 +82,8 @@ class Wsdl(WsdlBase):
             lambda group:group(_("Mount points"),
                 normal=('os_location_data',),
                 hide=('os_location_data','os_install_mbr','os_install_uefi_set'),
-                brief_force=('os_location_brief_data','os_install_bootloader',
-                             'os_install_uefi_set'),
+                brief_force=('os_location_brief_data','os_install_bootloader'),
+                brief=('os_install_uefi_brief_set',),
                 expert=('cl_uuid_set',
                         'os_install_root_type',
                         'os_install_mbr',