Author: aschnell
Date: Wed May 7 17:08:13 2008
New Revision: 47358
URL: http://svn.opensuse.org/viewcvs/yast?rev=47358&view=rev
Log:
- use AlwaysHidePartition
Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp?rev=47358&r1=47357&r2=47358&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Wed May 7 17:08:13 2008
@@ -42,7 +42,7 @@
void MakeNavigationTree(map open_items, list<term>& tree, map& data)
{
- // TODO: somehow use AlwaysHideDisk and AlwaysHidePartition
+ // TODO: somehow use AlwaysHideDisk
data = $[ `all : $[ `create : CreateAllPanel ],
`hd : $[ `create : CreateHdMainPanel, `handle : HandleHdMainPanel ],
@@ -57,6 +57,8 @@
map subtree = $[];
+ map target_map = Storage::GetTargetMap();
+
boolean open(any id)
{
@@ -67,7 +69,11 @@
void huhu(map disk, symbol type, map a, map b)
{
string disk_device = disk["device"]:"";
+
list<map> partitions = disk["partitions"]:[];
+ partitions = filter(map partition, partitions, {
+ return !StorageFields::AlwaysHidePartition(target_map, disk, partition);
+ });
list<term> tmp = [];
foreach(map partition, partitions, {
@@ -122,7 +128,6 @@
}
- map target_map = Storage::GetTargetMap();
StorageFields::IterateTargetMap(target_map, callback);
string short_hostname = Hostname::CurrentHostname();
Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp?rev=47358&r1=47357&r2=47358&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Wed May 7 17:08:13 2008
@@ -544,7 +544,7 @@
}
- boolean AlwaysHideDisk(map target_map, map disk)
+ global boolean AlwaysHideDisk(map target_map, map disk)
{
boolean real_disk = Storage::IsPartitionable(disk);
symbol type = disk["type"]:`CT_UNKNOWN;
@@ -560,7 +560,7 @@
}
- boolean AlwaysHidePartition(map target_map, map disk, map partition)
+ global boolean AlwaysHidePartition(map target_map, map disk, map partition)
{
boolean hide = partition["fsid"]:0 == Partitions::fsid_mac_hidden ||
disk["used_by_type"]:`UB_NONE==`UB_DMRAID;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
