diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 48016ca0d..e1c102901 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -73,6 +73,7 @@ - rfe: Protected profile fields don't show delete icon - fixed: Asset manager now sets "proceed" so we go back to asset manager after editing an asset - rfe: Registration form to keep user entries on error - required and errored fields are now highlighted. + - added: Thingy view template now has access to field_dateCreated and field_lastUpdated for Things. 7.5.22 - fixed: Layout template now gets prepared correctly diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index 7031c2dce..bf0dc1455 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -18,6 +18,7 @@ use WebGUI::International; use WebGUI::Utility; use WebGUI::Text; use WebGUI::Form::File; +use WebGUI::DateTime; use base 'WebGUI::Asset::Wobject'; @@ -2699,6 +2700,8 @@ sequenceNumber'); my $hidden = ($field{status} eq "hidden" && !$self->session->var->get("adminOn")); my $originalValue = $thingData{"field_".$field{fieldId}}; + my $dateCreated = $thingData{"dateCreated"}; + my $lastUpdated = $thingData{"lastUpdated"}; my $value = $self->getFieldValue($originalValue,\%field); my $otherThingUrl; @@ -2717,6 +2720,8 @@ sequenceNumber'); "label" => $field{label}, "isHidden" => $hidden, "url" => $otherThingUrl, + "dateCreated" => WebGUI::DateTime->new($self->session,$dateCreated)->toUserTimeZone(), + "lastUpdated" => WebGUI::DateTime->new($self->session,$lastUpdated)->toUserTimeZone(), ); push(@viewScreenTitleFields,$value) if ($field{viewScreenTitle}); push(@field_loop, { map {("field_".$_ => $fieldProperties{$_})} keys(%fieldProperties) }); diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 64c586da1..476c0a75f 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -222,11 +222,11 @@ sub createAccountSave { # Validate input my $error; $error = $self->error unless($self->validUsername($username)); - if ($setting->get("webguiUseCaptcha")) { - unless ($form->process('authWebGUI.captcha', "Captcha")) { - $error .= '