more bug fixes

docs/changelog/6.x.x.txt

@@ -16,6 +16,9 @@
  - fix [ 1029170 ] Forum: Sorting thread by date
  - Fixed a sort by last reply crash bug.
  - fix [ 1160947 ] Make page printable does not work
+ - fix [ 1150140 ] Manage users in group only views first page
+ - fix [ 1163470 ] [6.5.1CVS] Dataform, wrong template, bad edit URL
+ - fix [ 1159992 ] Integer value zero not returned in form fields
 
 
 6.5.1

lib/WebGUI/Asset.pm

@@ -2275,7 +2275,6 @@ sub www_add {
 		groupIdEdit => $self->get("groupIdEdit"),
 		ownerUserId => $self->get("ownerUserId"),
 		encryptPage => $self->get("encryptPage"),
-		templateId => $self->get("templateId"),
 		styleTemplateId => $self->get("styleTemplateId"),
 		printableStyleTemplateId => $self->get("printableStyleTemplateId"),
 		isHidden => $self->get("isHidden"),

lib/WebGUI/Asset/Wobject/DataForm.pm

@@ -133,7 +133,7 @@ sub definition {
                 properties=>{
 			templateId =>{
 				fieldType=>"template",
-				defaultValue=>undef,
+				defaultValue=>'PBtmpl0000000000000141',
 				},
 			acknowledgement=>{
 				fieldType=>"textarea",
@@ -148,7 +148,7 @@ sub definition {
 				defaultValue=>'PBtmpl0000000000000104',
 				},
 			listTemplateId=>{
-				defaultValue=>undef,
+				defaultValue=>'PBtmpl0000000000000021',
 				fieldType=>"template"
 				},
 			mailData=>{
@@ -192,10 +192,12 @@ sub duplicate {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm;
-   	
 	$tabform->getTab("display")->template(
-      		-value=>$self->getValue('templateId'),
-      		-namespace=>"DataForm"
+		-name=>"templateId",
+      		-value=>$self->getValue("templateId"),
+      		-namespace=>"DataForm",
+		-afterEdit=>'func=edit',
+		-defaultValue=>"PBtmpl0000000000000141"
    		);
         $tabform->getTab("display")->template(
                 -name=>"emailTemplateId",

lib/WebGUI/Form.pm

@@ -1208,13 +1208,12 @@ This will be used if no value is specified.
 
 sub integer {
 	my $params = shift;
-        my $value = $params->{value} || $params->{defaultValue} || 0;
-        my $size = $params->{size} || 11;
 	WebGUI::Style::setScript($session{config}{extrasURL}.'/inputCheck.js',{ language=>'javascript' });
 	return text({
 		name=>$params->{name},
-		value=>$value,
-		size=>$size,
+		value=>$params->{value},
+		defaultValue=>$params->{defaultValue} || 0,
+		size=>$params->{size} || 11,
 		extras=>'onKeyUp="doInputCheck(this.form.'.$params->{name}.',\'0123456789-\')" '.$params->{extras},
 		maxlength=>$params->{maxlength}
 		});

lib/WebGUI/Operation/Group.pm

@@ -542,7 +542,7 @@ sub www_manageUsersInGroup {
 		.WebGUI::Icon::_getBaseURL().'delete.gif" border="0"></td>
                 <td class="tableHeader">'.WebGUI::International::get(50).'</td>
                 <td class="tableHeader">'.WebGUI::International::get(369).'</td></tr>';
-	my $p = WebGUI::Paginator->new("op=manageUsersInGroup&gid=".$session{form}{gid});
+	my $p = WebGUI::Paginator->new(WebGUI::URL::page("op=manageUsersInGroup&gid=".$session{form}{gid}));
         $p->setDataByQuery("select users.username,users.userId,groupings.expireDate
                 from groupings,users where groupings.groupId=".quote($session{form}{gid})." and groupings.userId=users.userId
                 order by users.username");