diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 3397e57f6..f3f033e86 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -550,7 +550,7 @@ sub getEditForm { -value=>$self->get("newWindow"), -label=>$i18n->get(940), -hoverHelp=>$i18n->get('940 description'), - -uiLevel=>6 + -uiLevel=>9 ); $tabform->addTab("security",$i18n->get(107),6); $tabform->getTab("security")->yesNo( diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm index 8990b1c67..3d686a354 100644 --- a/lib/WebGUI/AssetBranch.pm +++ b/lib/WebGUI/AssetBranch.pm @@ -128,7 +128,7 @@ sub www_editBranch { -name=>"newWindow", -value=>$self->get("newWindow"), -label=>$i18n->get(940), - -hoverHelp=>$i18n->get('940 description',"Asset"), + -hoverHelp=>$i18n->get('940 description'), -uiLevel=>6, -subtext=>'
'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_newWindow"}) ); diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm index 71bbfabae..564809b49 100644 --- a/lib/WebGUI/VersionTag.pm +++ b/lib/WebGUI/VersionTag.pm @@ -96,7 +96,7 @@ sub commit { $asset->commit; } $self->{_data}{isCommitted} = 1; - $self->{_data}{committedBy} = $self->session->user->userId; + $self->{_data}{committedBy} = $self->session->user->userId unless ($self->{_data}{committedBy}); $self->{_data}{commitDate} = $self->session->datetime->time(); $self->session->db->setRow("assetVersionTag", "tagId", $self->{_data}); $self->clearWorking; @@ -258,6 +258,7 @@ sub requestCommit { methodName=>"new", parameters=>$self->getId }); + $self->{_data}{committedBy} = $self->session->user->userId; $self->{_data}{workflowInstanceId} = $instance->getId; $self->session->db->setRow("assetVersionTag","tagId",$self->{_data}); } diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 0fb9679fe..8b89130d2 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -260,10 +260,10 @@ a URL will be made from the parent's URL and the Menu Title.
}, '940 description' => { - message => q|

Select yes to open this asset in a new window.
-UI level: 6 + message => q|

Select yes to open this asset in a new window. Note that there are potentially many problems with this. It may not work in some navigations, or if the user turns off Javascript, or it may be blocked by some pop-up blockers. Use this feature with care.
+UI level: 9

|, - lastUpdated => 1127426196, + lastUpdated => 1143218834, }, 'encrypt page description' => { diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 6dc812022..0edf2304d 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -373,11 +373,6 @@ Be aware that any database links you create here will be available to all conten lastUpdated => 1056151382 }, - '940' => { - message => q|Open in new window?|, - lastUpdated => 1050438829 - }, - '43' => { message => q|Are you certain that you wish to delete this content?|, lastUpdated => 1031514049