fixed - fix [ 1276625 ] viewRSS not working (Andrew Khmelev)

- fix [ 1276695 ] Addition to 'viewRSS not working' (6.7.2) (Andrew Khmelev)
 - Fixed a layout problem with the user search form.
 - fix [ 1250418 ] unable to edit posts more than once

docs/changelog/6.x.x.txt

@@ -4,7 +4,10 @@
    and karma were not showing up when editing users.
  - fix [ 1274239 ] Can Not Save Edits to Assets
  - fix [ 1274414 ] extraHeadTags entirely unused (mwilson)
-
+ - fix [ 1276625 ] viewRSS not working (Andrew Khmelev)
+ - fix [ 1276695 ] Addition to 'viewRSS not working' (6.7.2) (Andrew Khmelev)
+ - Fixed a layout problem with the user search form.
+ - fix [ 1250418 ] unable to edit posts more than once
 
 6.7.2
  - fix [ 1163407 ] Ampersand XHTML 1.0 Non-Compliant

lib/WebGUI/Asset/Post.pm

@@ -983,7 +983,7 @@ sub www_edit {
 				value=>"edit"
 				})
 			.WebGUI::Form::hidden({
-				name=>"userId",
+				name=>"ownerUserId",
 				value=>$self->getValue("ownerUserId")
 				})
 			.WebGUI::Form::hidden({

lib/WebGUI/Asset/Wobject/Collaboration.pm

@@ -1141,13 +1141,13 @@ sub www_viewRSS {
 		group by assetData.assetId
 		order by ".$self->getValue("sortBy")." ".$self->getValue("sortOrder"));
 	my $i = 1;
-        while (my ($id, $class, $version)  = $sth->hashRef) {
+        while (my ($id, $class, $version)  = $sth->array) {
 		my $post = WebGUI::Asset::Wobject::Collaboration->new($id, $class, $version);
 
                 my $encUrl = _xml_encode(WebGUI::URL::getSiteURL().$post->getUrl);
                 my $encTitle = _xml_encode($post->get("title"));
                 my $encPubDate = _xml_encode(_get_rfc822_date($post->get("dateUpdated")));
-                my $encDescription = _xml_encode($self->get("synopsis"));
+                my $encDescription = _xml_encode($post->get("synopsis"));
                 $xml .= qq~
 <item>
 <title>$encTitle</title>

lib/WebGUI/HTMLForm.pm

@@ -78,7 +78,6 @@ sub _tableFormRow {
 	my $label = shift;
 	my $formControl = shift;
 	my $hoverHelp = shift;
-	unless ($self->{_noTable}) {
 		my $class = $self->{_class};
 		$class = qq| class="$class" | if($class);
 		$hoverHelp =~ s/\r/ /g;	
@@ -94,9 +93,6 @@ sub _tableFormRow {
 		$hoverHelp =~ s/^\s+//;
 		my $tooltip = qq|onmouseover="return escape('$hoverHelp')"| if ($hoverHelp);
         	return '<tr'.$class.'><td '.$tooltip.' class="formDescription" valign="top" style="width: 25%;">'.$label.'</td><td class="tableData" style="width: 75%;">'.$formControl."</td></tr>\n";
-	} else {
-		return $formControl;
-	}
 }
 
 #-------------------------------------------------------------------
@@ -192,14 +188,10 @@ sub dynamicField {
 
 #-------------------------------------------------------------------
 
-=head2 new ( [ noTable, action, method, extras, enctype, tableExtras ] )
+=head2 new ( [ action, method, extras, enctype, tableExtras ] )
 
 Constructor.
 
-=head3 noTable
-
-If this is set to "1" then no table elements will be wrapped around each form element. Defaults to "0".
-
 =head3 action
 
 The Action URL for the form information to be submitted to. This defaults to the current page.
@@ -230,17 +222,16 @@ sub new {
 	my ($header, $footer);
 	my $class = shift;
 	my %param = @_;
-	$param{noTable} ||= 0;
 	$header = "\n\n".WebGUI::Form::formHeader({
 		action=>$param{action},
 		extras=>$param{extras},
 		method=>$param{method},
 		enctype=>$param{enctype}
 		});
-	$header .= "\n<table ".$param{tableExtras}.'><tbody>' unless ($param{noTable});
-	$footer = "</tbody></table>\n" unless ($param{noTable});
+	$header .= "\n<table ".$param{tableExtras}.'><tbody>';
+	$footer = "</tbody></table>\n" ;
 	$footer .= WebGUI::Form::formFooter();
-        bless {_uiLevelOverride=>$param{uiLevelOverride}, _noTable => $param{noTable}, _header => $header, _footer => $footer, _data => ''}, $class;
+        bless {_uiLevelOverride=>$param{uiLevelOverride},  _header => $header, _footer => $footer, _data => ''}, $class;
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/Operation/User.pm

@@ -18,6 +18,7 @@ use WebGUI::DateTime;
 use WebGUI::FormProcessor;
 use WebGUI::Group;
 use WebGUI::Grouping;
+use WebGUI::Form;
 use WebGUI::HTMLForm;
 use WebGUI::Icon;
 use WebGUI::International;
@@ -107,23 +108,23 @@ sub getUserSearchForm {
 	WebGUI::Session::setScratch("userSearchKeyword",$session{form}{keyword});
 	WebGUI::Session::setScratch("userSearchStatus",$session{form}{status});
 	WebGUI::Session::setScratch("userSearchModifier",$session{form}{modifier});
-	my $output = '<div align="center">';
-	my $f = WebGUI::HTMLForm->new(1);
-	$f->hidden(
-		-name => "op",
-		-value => $op
-		);
+	my $output = '<div align="center">'
+		.WebGUI::Form::formHeader()
+		.WebGUI::Form::hidden(
+			name => "op",
+			value => $op
+			);
 	foreach my $key (keys %{$params}) {
-		$f->hidden(
-			-name=>$key,
-			-value=>$params->{$key}
+		$output .= WebGUI::Form::hidden(
+			name=>$key,
+			value=>$params->{$key}
 			);
 	}
-	$f->hidden(
+	$output .= WebGUI::Form::hidden(
 		-name=>"doit",
 		-value=>1
-		);
-	$f->selectList(
+		)
+	.WebGUI::Form::selectList(
 		-name=>"modifier",
 		-value=>([$session{scratch}{userSearchModifier} || "contains"]),
 		-options=>{
@@ -131,13 +132,13 @@ sub getUserSearchForm {
 			contains=>WebGUI::International::get("contains"),
 			endsWith=>WebGUI::International::get("ends with")
 			}
-		);
-	$f->text(
+		)
+	.WebGUI::Form::text(
 		-name=>"keyword",
 		-value=>$session{scratch}{userSearchKeyword},
 		-size=>15
-		);
-	$f->selectList(
+		)
+	.WebGUI::Form::selectList(
 		-name	=> "status",
 		-value	=> [$session{scratch}{userSearchStatus} || "users.status like '%'"],
 		-options=> { 
@@ -146,9 +147,9 @@ sub getUserSearchForm {
 			Deactivated	=> WebGUI::International::get(818),
 			Selfdestructed	=> WebGUI::International::get(819)
 			}
-	);
-	$f->submit(value=>WebGUI::International::get(170));
-	$output .= $f->print;
+	)
+	.WebGUI::Form::submit(value=>WebGUI::International::get(170))
+	.WebGUI::Form::formFooter();
 	$output .= '</div>';
 	return $output;
 }

lib/WebGUI/Style.pm

@@ -85,7 +85,7 @@ sub generateAdditionalHeadTags {
 		$tags .= ' />'."\n";
 	}
 	# append extraHeadTags
-	$tags .= $session{asset}->getExtraHeadTags."\n";
+	$tags .= $session{asset}->getExtraHeadTags."\n" if ($session{asset});
 	
 	delete $session{page}{head};
 	return $tags;