From 1a1f477563e53d84fde70ee0838538c27a4ecbfe Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Mon, 12 Dec 2005 04:33:54 +0000 Subject: [PATCH] - Fixed bug where viewProfile did not show pretty printed values - Fixed bug/rfe where it was not obvious when hovering over the rank column in the Asset Manager that you can drag rows up and down. Added cursor:move to the td's style. --- docs/changelog/6.x.x.txt | 4 ++++ lib/WebGUI/Asset.pm | 2 +- lib/WebGUI/Operation/Profile.pm | 2 +- lib/WebGUI/ProfileField.pm | 6 ++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 21af8dc7e..4dfc10406 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,5 +1,9 @@ 6.8.2 - Added macro to return the MIME type to a file, FetchMimeType. + - Fixed bug where viewProfile did not show pretty printed values + - Fixed bug/rfe where it was not obvious when hovering over the rank + column in the Asset Manager that you can drag rows up and down. + Added cursor:move to the td's style. 6.8.1 - fix [ 1364965 ] Assets in Trash give Permission Denied in stead of Not diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 434faf4c3..6ee43cde3 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1495,7 +1495,7 @@ sub www_manageAssets { var assetManager = new AssetManager(); assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form'); assetManager.AddColumn(' ','','center',''); - assetManager.AddColumn('".$i18n->get("rank")."','','right','numeric'); + assetManager.AddColumn('".$i18n->get("rank")."','style=\"cursor:move\"','right','numeric'); assetManager.AddColumn('".$i18n->get("99")."','','left',''); assetManager.AddColumn('".$i18n->get("type")."','','left',''); assetManager.AddColumn('".$i18n->get("last updated")."','','center',''); diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm index 765c6276f..500b069e1 100644 --- a/lib/WebGUI/Operation/Profile.pm +++ b/lib/WebGUI/Operation/Profile.pm @@ -159,7 +159,7 @@ sub www_viewProfile { next if ($field->get("fieldName") eq "email" && !$u->profileField("publicEmail")); push(@array, { 'profile.label' => $field->getLabel, - 'profile.value' => $u->profileField($field->getId) + 'profile.value' => $field->formField({dataDefault => $u->profileField($field->getId)},2) }); } } diff --git a/lib/WebGUI/ProfileField.pm b/lib/WebGUI/ProfileField.pm index f2e36d891..ccc41987e 100644 --- a/lib/WebGUI/ProfileField.pm +++ b/lib/WebGUI/ProfileField.pm @@ -116,7 +116,7 @@ Optionally pass in a list of properties to override the default properties of an =head3 withWrapper -A boolean indicating whether to return just the field, or the field with a table label wrapper. +An integer indicating whether to return just the field's form input, or the field with a table label wrapper (1), or just the field value (2). =cut @@ -143,8 +143,10 @@ sub formField { $default = WebGUI::Operation::Shared::secureEval($properties->{dataDefault}); } $properties->{value} = $default; - if ($withWrapper) { + if ($withWrapper == 1) { return WebGUI::Form::DynamicField->new(%{$properties})->displayFormWithWrapper; + } elsif ($withWrapper == 2) { + return WebGUI::Form::DynamicField->new(%{$properties})->displayValue; } else { return WebGUI::Form::DynamicField->new(%{$properties})->displayForm; }