Changeset 2218
- Timestamp:
- 06/07/07 15:52:38 (1 year ago)
- Files:
-
- Trunk/WebGUI/Asset/Post.pm (modified) (1 diff)
- Trunk/WebGUI/Asset/Wobject/Collaboration2.pm (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/WebGUI/Asset/Post.pm
r2207 r2218 1182 1182 value => $userDefinedValue, 1183 1183 }); 1184 $var{'userDefined'.$x.'.form.url'} 1185 = WebGUI::Form::Url($self->session, { 1186 name => "userDefined".$x, 1187 value => $userDefinedValue, 1188 }); 1184 1189 } 1185 1190 Trunk/WebGUI/Asset/Wobject/Collaboration2.pm
r2208 r2218 16 16 use base 'WebGUI::Asset::Wobject::Collaboration'; # is a relationship 17 17 18 sub definition { #override definition18 sub definition { 19 19 my $class = shift; 20 20 my $session = shift; … … 366 366 367 367 push(@{$definition}, { 368 assetName=>' collaboration2',368 assetName=>'Collaboration2', 369 369 autoGenerateForms=>1, 370 370 icon=>'collaboration.gif', … … 373 373 properties=>\%properties, 374 374 }); 375 # !!!!!! 376 #return $class->SUPER::definition($session, $definition); 375 377 return $class->WebGUI::Asset::Wobject::definition($session, $definition); 378 # !!!!!! 376 379 } 377 #------------------------------------------------------------------- 380 378 381 sub getNewPromptLines { 379 382 my $number_of_promptlines = 5; # set this up in voxforge config file... … … 395 398 } 396 399 } 400 397 401 #------------------------------------------------------------------- 398 sub WebGUI::Asset::Post::definition { 399 my $class = shift; 400 my $session = shift; 401 my $definition = shift; 402 my $i18n = WebGUI::International->new($session,"Asset_Post"); 403 push(@{$definition}, { 404 assetName=>$i18n->get('assetName'), 405 icon=>'post.gif', 406 tableName=>'Post', 407 className=>'WebGUI::Asset::Post', 408 properties=>{ 409 storageId => { 410 fieldType=>"image", 411 defaultValue=>undef 412 }, 413 threadId => { 414 noFormPost=>1, 415 fieldType=>"hidden", 416 defaultValue=>undef 417 }, 418 dateSubmitted => { 419 noFormPost=>1, 420 fieldType=>"hidden", 421 defaultValue=>$session->datetime->time() 422 }, 423 dateUpdated => { 424 fieldType=>"hidden", 425 defaultValue=>$session->datetime->time() 426 }, 427 username => { 428 fieldType=>"hidden", 429 defaultValue=>$session->form->process("visitorUsername") || $session->user->profileField("alias") || $session->user->username 430 }, 431 rating => { 432 noFormPost=>1, 433 fieldType=>"hidden", 434 defaultValue=>undef 435 }, 436 views => { 437 noFormPost=>1, 438 fieldType=>"hidden", 439 defaultValue=>undef 440 }, 441 contentType => { 442 fieldType=>"contentType", 443 defaultValue=>"mixed" 444 }, 445 userDefined1 => { 446 fieldType=>"HTMLArea", 447 defaultValue=>getNewPromptLines() 448 }, 449 userDefined2 => { 450 fieldType=>"HTMLArea", 451 defaultValue=>undef 452 }, 453 userDefined3 => { 454 fieldType=>"HTMLArea", 455 defaultValue=>undef 456 }, 457 userDefined4 => { 458 fieldType=>"HTMLArea", 459 defaultValue=>undef 460 }, 461 userDefined5 => { 462 fieldType=>"HTMLArea", 463 defaultValue=>undef 464 }, 465 content => { 466 fieldType=>"HTMLArea", 467 defaultValue=>undef 468 } 469 }, 470 }); 471 # !!!!!! 472 #return $class->SUPER::definition($session,$definition); 473 return $class->WebGUI::Asset::definition($session,$definition); 474 # !!!!!! 475 } 476 477 #------------------------------------------------------------------- 478 #sub WebGUI::Asset::Post::www_edit { 479 sub skip { 402 sub WebGUI::Asset::Post::www_edit { 480 403 my $self = shift; 481 404 my (%var, $content, $title, $synopsis); 482 405 # !!!!!! 483 my $userDefined1;406 my $userDefinedValue1; 484 407 # !!!!!! 485 408 my $i18n = WebGUI::International->new($self->session); 486 ####################################################################################487 # new post488 409 if ($self->session->form->process("func") eq "add") { # new post 489 410 $var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getParent->getUrl}) … … 501 422 }); 502 423 $var{'isNewPost'} = 1; 424 503 425 # !!!!!! 504 426 $content = $self->session->form->process("content"); 505 #my $prompts = WebGUI::HTML::makeParameterSafe(getNewPromptLines());506 #$self->update({userDefined1=>"ken one more try"}); # can't update an object that has not been created yet ... 507 $userDefined1 =getNewPromptLines();508 # $content = $userDefined1; #works!427 #my $prompts = WebGUI::Form::makeParameterSafe(getNewPromptLines()); 428 429 #$content = $self->session->form->process("content") . getNewPromptLines(); 430 # !!!!!! 509 431 510 #$var{'userDefined1'} = $userDefined1; # does not work511 #$var{'userDefined1.form'}512 # = WebGUI::Form::text($self->session, {513 # name => "userDefined",514 # value => $userDefined1,515 # });516 # !!!!!!517 432 $title = $self->session->form->process("title"); 518 433 $synopsis = $self->session->form->process("synopsis"); 519 ####################################################################################520 # new reply521 434 if ($self->session->form->process("class","className") eq "WebGUI::Asset::Post") { # new reply 522 435 $self->{_thread} = $self->getParent->getThread; … … 538 451 value=>$self->session->form->process("subscribe") 539 452 }); 540 ####################################################################################541 # new thread542 453 } elsif ($self->session->form->process("class","className") eq "WebGUI::Asset::Post::Thread") { # new thread 543 454 return $self->session->privilege->insufficient() unless ($self->getThread->getParent->canPost); … … 553 464 value=>$self->session->form->process('lock') 554 465 }); 555 }466 } 556 467 $var{'subscribe.form'} = WebGUI::Form::yesNo($self->session, { 557 468 name=>"subscribe", 558 469 value=>$self->session->form->process("subscribe") || 1 559 470 }); 471 # !!!!!! 472 #$content = $self->session->form->process("content"); 473 #my $prompts = WebGUI::Form::makeParameterSafe(getNewPromptLines()); 474 #my $prompts = WebGUI::Form::makeParameterSafe(getNewPromptLines()); 475 #my $prompts = "test"; 476 #$self->update({userDefined1=>$prompts}); 477 478 $userDefinedValue1 = getNewPromptLines(); 479 $content = $userDefinedValue1; 480 $var{'userDefined1'} = $userDefinedValue1; 481 $var{'userDefined1.form'} 482 = WebGUI::Form::text($self->session, { 483 name => "userDefined1", 484 value => $userDefinedValue1, 485 }); 486 $var{'userDefined1.form.textarea'} 487 = WebGUI::Form::textarea($self->session, { 488 name => "userDefined1", 489 value => $userDefinedValue1, 490 }); 491 492 # !!!!!! 560 493 } 561 494 $content .= "\n\n".$self->session->user->profileField("signature") if ($self->session->user->profileField("signature") && !$self->session->form->process("content")); 562 ####################################################################################563 # edit564 495 } else { # edit 565 496 return $self->session->privilege->insufficient() unless ($self->canEdit); … … 586 517 $title = $self->session->form->process('title') || $self->getValue("title"); 587 518 $synopsis = $self->session->form->process('synopsis') || $self->getValue("synopsis"); 588 # !!!!!!589 #my $userDefined1 = $self->getValue('userDefined1');590 # $var{'userDefined1.form'}591 # = WebGUI::Form::text($self->session, {592 # name => "userDefined1",593 # value => $userDefined1,594 # });595 # !!!!!!596 519 } 597 ####################################################################################598 # all599 520 $var{'archive.form'} = WebGUI::Form::yesNo($self->session, { 600 521 name=>"archive" … … 617 538 value => $self->session->form->process('visitorName') || $self->getValue("visitorName") 618 539 }); 619 # !!!!!! 620 for my $x (1..5) { 621 # !!!!!! 540 # !!!!!! 541 542 for my $x (2..5) { 543 # for my $x (1..5) { 544 # !!!!!! 622 545 my $userDefinedValue 623 = $self->session->form->process("userDefined".$x) 624 || $self->getValue("userDefined".$x) 625 ; 626 $var{'userDefined'.$x} = $userDefinedValue; 627 546 = $self->session->form->process("userDefined".$x) 547 || $self->getValue("userDefined".$x) 548 ; 549 $var{'userDefined'.$x} = $userDefinedValue; 628 550 $var{'userDefined'.$x.'.form'} 629 551 = WebGUI::Form::text($self->session, { … … 651 573 value => $userDefinedValue, 652 574 }); 575 $var{'userDefined'.$x.'.form.url'} 576 = WebGUI::Form::Url($self->session, { 577 name => "userDefined".$x, 578 value => $userDefinedValue, 579 }); 653 580 } 654 581 … … 703 630 704 631 632 705 633 1;