USS ready for prime time

lib/WebGUI/Asset/USS_submission.pm

@@ -146,19 +146,6 @@ sub getResponseCount {
 	return 0;
 }
 
-#-------------------------------------------------------------------
-sub getStatus {
-	my $self = shift;
-	my $status = shift || $self->get("status");
-        if ($status eq "Approved") {
-                return WebGUI::International::get(560);
-        } elsif ($status eq "Denied") {
-                return WebGUI::International::get(561);
-        } elsif ($status eq "Pending") {
-                return WebGUI::International::get(562);
-        }
-}
-
 #-------------------------------------------------------------------
 sub getThumbnailUrl {
 	return '/thumbnail.jpg';
@@ -215,7 +202,7 @@ sub view {
 	$var{"date.updated.human"} = epochToHuman($self->get("dateUpdated"));
 	$var{"date.updated.epoch"} = $self->get("dateUpdated");
 	$var{"status.label"} = WebGUI::International::get(14,"USS");
-	$var{"status.status"} = $self->getStatus;
+	$var{"status.status"} = $self->getParent->status($self->get("status"));
 	$var{"views.label"} = WebGUI::International::get(514);
 	$var{"views.count"} = $self->getResponseCount;
         $var{canPost} = $self->canContribute;

lib/WebGUI/Asset/Wobject/USS.pm

@@ -92,7 +92,7 @@ sub definition {
 				defaultValue=>0
 				},
 			filterContent=>{
-				fieldType=>"filter",
+				fieldType=>"filterContent",
 				defaultValue=>"javascript"
 				},
 			sortBy=>{
@@ -119,7 +119,7 @@ sub definition {
 #-------------------------------------------------------------------
 sub getEditForm {
 	my $self = shift;
-	my $tabform = $self->getEditForm;
+	my $tabform = $self->SUPER::getEditForm;
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
       		-namespace=>"USS"
@@ -156,9 +156,9 @@ sub getEditForm {
         $tabform->getTab("security")->selectList(
 		-name=>"defaultStatus",
 		-options=>{
-			Approved=>status('Approved'),
+			Approved=>$self->status('Approved'),
-			Denied=>status('Denied'),
+			Denied=>$self->status('Denied'),
-			Pending=>status('Pending')
+			Pending=>$self->status('Pending')
 			},
 		-label=>WebGUI::International::get(563),
 		-value=>[$self->getValue("defaultStatus")]
@@ -282,13 +282,19 @@ sub getName {
         return WebGUI::International::get(29,"USS");
 }
 
-#-------------------------------------------------------------------
-sub processPropertiesFromFormPost {
-	my $self = shift;
-	$self->SUPER::processPropertiesFromFormPost;
-        $self->deleteAllCachedSubmissions;
-}
 
+#-------------------------------------------------------------------
+sub status {
+	my $self = shift;
+	my $status = shift;
+        if ($status eq "Approved") {
+                return WebGUI::International::get(560);
+        } elsif ($status eq "Denied") {
+                return WebGUI::International::get(561);
+        } elsif ($status eq "Pending") {
+                return WebGUI::International::get(562);
+        }
+}
 
 #-------------------------------------------------------------------
 sub view {
@@ -368,7 +374,7 @@ sub view {
                         "submission.userDefined5"=>$submission->get("userDefined5"),
                         "submission.userId"=>$submission->get("userId"),
                         "submission.username"=>$submission->get('username'),
-                        "submission.status"=>$submission->getStatus,
+                        "submission.status"=>$self->status($submission->get("status")),
                         "submission.thumbnail"=>$submission->getThumbnailUrl,
                         "submission.image"=>$submission->getImageUrl,
                         "submission.date"=>epochToHuman($submission->get("dateSubmitted")),