workflow with approval officially works

lib/WebGUI/Operation/Inbox.pm

@@ -96,12 +96,12 @@ sub www_viewInboxMessage {
 	   	$vars->{'dateStamp'} =$session->datetime->epochToHuman($message->get("dateStamp"));
    		$vars->{'status'} = _status($session)->{$message->get("status")}; 
 		$vars->{message} = $message->get("message");
-   		unless ($vars->{message} =~ /\<div/ig || $vars->{message} =~ /\<br/ig || $vars->{message} =~ /\<p/ig) {
-      			$vars->{message} =~ s/\n/\<br\>/g;
-   		}
    		unless ($vars->{message} =~ /\<a/ig) {
       			$vars->{message} =~ s/(http\S*)/\<a href=\"$1\"\>$1\<\/a\>/g;
    		}
+   		unless ($vars->{message} =~ /\<div/ig || $vars->{message} =~ /\<br/ig || $vars->{message} =~ /\<p/ig) {
+      			$vars->{message} =~ s/\n/\<br \/\>\n/g;
+   		}
 	}
    	$vars->{'accountOptions'} = WebGUI::Operation::Shared::accountOptions($session);
    	return $session->style->userStyle(WebGUI::Asset::Template->new($session,"PBtmpl0000000000000205")->process($vars));

lib/WebGUI/Operation/VersionTag.pm

@@ -54,7 +54,7 @@ sub www_approveVersionTag {
 	my $instance = $tag->getWorkflowInstance;
 	my $activity = $instance->getNextActivity;
 	return $session->privilege->insufficient() unless ($session->user->isInGroup($activity->get("groupToApprove")));
-	if ($session->form->process("status", "selectBox") eq "approved") {
+	if ($session->form->process("status", "selectBox") eq "approve") {
 		$activity->setApproved($instance);
 	} else {
 		$activity->setDenied($instance);

lib/WebGUI/Workflow/Activity/NotifyAboutVersionTag.pm

@@ -65,12 +65,6 @@ sub definition {
 				label=>$i18n->get("who to notify"),
 				hoverHelp=>$i18n->get("who to notify help")
 				},
-			subject => {
-				fieldType=>"text",
-				defaultValue=>"",
-				label=>$i18n->get("notify subject"),
-				hoverHelp => $i18n->get("notify subject help")
-				},
 			message => {
 				fieldType=>"textarea",
 				defaultValue => "",
@@ -97,8 +91,8 @@ sub execute {
 	my $inbox = WebGUI::Inbox->new($self->session);
 	my $properties = {
 		status=>"completed",
-		subject=>$self->get("subject"),
-		message=>$self->get("message")."\n\n".$versionTag->get("name")."\n\n".$versionTag->get("comments"),
+		subject=>$versionTag->get("name"),
+		message=>$self->get("message")."\n\n".$versionTag->get("comments"),
 		};	
 	if ($self->get("who") eq "committer") {
 		$properties->{userId} = $versionTag->get("committedBy");

lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm

@@ -19,6 +19,7 @@ use strict;
 use base 'WebGUI::Workflow::Activity';
 use WebGUI::VersionTag;
 use WebGUI::Inbox;
+use WebGUI::International;
 
 =head1 NAME
 
@@ -60,12 +61,6 @@ sub definition {
 				label=>$i18n->get("group to approve"),
 				hoverHelp=>$i18n->get("group to approve help")
 				},
-			subject => {
-				fieldType=>"text",
-				defaultValue=>"",
-				label=>$i18n->get("approval subject"),
-				hoverHelp => $i18n->get("approval subject help")
-				},
 			message => {
 				fieldType=>"textarea",
 				defaultValue => "",
@@ -96,13 +91,14 @@ sub execute {
 	my $self = shift;
 	my $versionTag = shift;
 	my $instance = shift;
+	my $i18n = WebGUI::International->new($self->session, "VersionTag");
 	my $inbox = WebGUI::Inbox->new($self->session);
 	if ($instance->getScratch("status") eq "") {
 		my $message = $inbox->addMessage({
-			subject=>$self->get("subject"),
+			subject=>$i18n->get("approve/deny").": ".$versionTag->get("name"),
 			message=>join("\n\n",$self->get("message"),
-				$self->session->url->page("op=manageRevisionsInTag;workflowInstanceId=".$instance->getId.";tagId=".$versionTag->getId),
-				$versionTag->get('name'), $versionTag->get("comments")),
+				$self->session->url->getSiteURL().$self->session->url->page("op=manageRevisionsInTag;workflowInstanceId=".$instance->getId.";tagId=".$versionTag->getId),
+				$versionTag->get("comments")),
 			groupId=>$self->get("groupToApprove"),
 			status=>'pending'
 			});

lib/WebGUI/i18n/English/VersionTag.pm

@@ -84,36 +84,12 @@ our $I18N = {
 		context => q|hover help for the notify message field|
 	},
 
-	'notify subject' => {
-		message => q|Notification Subject|,
-		lastUpdated => 0,
-		context => q|label in the notify about version tag activity|
-	},
-
-	'notify subject help' => {
-		message => q|Enter the subject line of the approval message.|,
-		lastUpdated => 0,
-		context => q|hover help for the notify subject field|
-	},
-
 	'notify about version tag' => {
 		message => q|Notify About Version Tag|,
 		lastUpdated => 0,
 		context => q|the name of the activity|
 	},
 
-	'approval subject' => {
-		message => q|Approval Subject|,
-		lastUpdated => 0,
-		context => q|label in the request approval for version tag activity|
-	},
-
-	'approval subject help' => {
-		message => q|Enter the subject line of the approval message.|,
-		lastUpdated => 0,
-		context => q|hover help for the approval subject field|
-	},
-
 	'approval message' => {
 		message => q|Approval Message|,
 		lastUpdated => 0,