Author: aschnell Date: Fri Mar 23 12:02:20 2012 New Revision: 67695 URL: http://svn.opensuse.org/viewcvs/yast?rev=67695&view=rev Log: - hide instead of disable some unavailable fstab mount options (bnc#714398) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=67695&r1=67694&r2=67695&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Mar 23 12:02:20 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 23 11:55:48 CET 2012 - aschnell@suse.de + +- hide instead of disable some unavailable fstab mount options + (bnc#714398) + +------------------------------------------------------------------- Tue Mar 13 15:15:28 CET 2012 - fehr@suse.de - warn about slowness when resizing mounted fs by more than 50Gig Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=67695&r1=67694&r2=67695&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Mar 23 12:02:20 2012 @@ -465,10 +465,15 @@ list<map> opt_list = []; if( new["mount"]:"" != "swap" ) { - foreach( map entry, FileSystems::GetGeneralFstabOptions(), - ``{ - opt_list = add( opt_list, entry ); + foreach( map entry, FileSystems::GetGeneralFstabOptions(), { + + if (entry[`query_key]:"" == "opt_quota" && !FileSystems::CanDoQuota(new)) + continue; + if (entry[`query_key]:"" == "opt_readonly" && !FileSystems::CanMountRo(new)) + continue; + + opt_list = add( opt_list, entry ); contents = add( contents, entry[`widget]:emptyterm ); helptext = helptext + entry[`help_text]:""; }); @@ -625,16 +630,6 @@ UI::ChangeWidget( `id("opt_user"), `Enabled, new["enc_type"]:`none==`none ); } - if( UI::WidgetExists( `id("opt_quota") )) - { - UI::ChangeWidget( `id("opt_quota"), `Enabled, - FileSystems::CanDoQuota(new) ); - } - if( UI::WidgetExists( `id("opt_readonly") )) - { - UI::ChangeWidget( `id("opt_readonly"), `Enabled, - FileSystems::CanMountRo(new) ); - } foreach( any key, any value, old_state, ``{ UI::ChangeWidget( `id(key), `Value, value ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org