many bug fixes
This commit is contained in:
parent
66e2028c3a
commit
2a1db10c8b
7 changed files with 22 additions and 30 deletions
|
|
@ -108,7 +108,6 @@ sub definition {
|
|||
defaultValue=>time()
|
||||
},
|
||||
username => {
|
||||
noFormPost=>1,
|
||||
fieldType=>"hidden",
|
||||
defaultValue=>$session{user}{alias} || $session{user}{username}
|
||||
},
|
||||
|
|
@ -373,6 +372,7 @@ sub getTemplateVars {
|
|||
my %var = %{$self->get};
|
||||
$var{"userId"} = $self->get("ownerUserId");
|
||||
$var{"user.isPoster"} = $self->isPoster;
|
||||
$var{"userProfile.url"} = $self->getUrl("op=viewProfile&uid=".$self->get("ownerUserId"));
|
||||
|
||||
$var{"dateSubmitted.human"} = epochToHuman($self->get("dateSubmitted"));
|
||||
$var{"dateUpdated.human"} = epochToHuman($self->get("dateUpdated"));
|
||||
|
|
@ -751,7 +751,7 @@ sub setStatusPending {
|
|||
my ($self) = @_;
|
||||
$self->update({status=>'pending'});
|
||||
WebGUI::MessageLog::addInternationalizedEntry('',$self->getThread->getParent->get("moderateGroupId"),
|
||||
$self->getUrl,578,'WebGUI','pending');
|
||||
$self->getUrl("func=view"),578,'WebGUI','pending');
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -229,10 +229,10 @@ sub getEditForm {
|
|||
-value=>$self->getValue("mailData")
|
||||
);
|
||||
if ($self->getId eq "new" && $session{form}{proceed} ne "manageAssets") {
|
||||
$self->getTab("properties")->whatNext(
|
||||
$tabform->getTab("properties")->whatNext(
|
||||
-options=>{
|
||||
addField=>WebGUI::International::get(76,"DataForm"),
|
||||
backToPage=>WebGUI::International::get(745,"DataForm")
|
||||
editField=>WebGUI::International::get(76,"DataForm"),
|
||||
""=>WebGUI::International::get(745,"DataForm")
|
||||
},
|
||||
-value=>"editField"
|
||||
);
|
||||
|
|
@ -749,10 +749,10 @@ sub www_editField {
|
|||
if ($session{form}{fid} eq "new" && $session{form}{proceed} ne "manageAssets") {
|
||||
$f->whatNext(
|
||||
-options=>{
|
||||
addField=>WebGUI::International::get(76,"DataForm"),
|
||||
backToPage=>WebGUI::International::get(745,"DataForm")
|
||||
editField=>WebGUI::International::get(76,"DataForm"),
|
||||
""=>WebGUI::International::get(745,"DataForm")
|
||||
},
|
||||
-value=>"addField"
|
||||
-value=>"editField"
|
||||
);
|
||||
}
|
||||
$f->submit;
|
||||
|
|
@ -790,10 +790,6 @@ sub www_editFieldSave {
|
|||
" where DataForm_fieldId=".quote($session{form}{fid}));
|
||||
}
|
||||
$self->reorderCollateral("DataForm_field","DataForm_fieldId", _tonull("DataForm_tabId",$session{form}{tid})) if ($session{form}{fid} ne "new");
|
||||
if ($session{form}{proceed} eq "addField") {
|
||||
$session{form}{fid} = "new";
|
||||
return $self->www_editField();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
@ -824,11 +820,11 @@ sub www_editTab {
|
|||
if ($session{form}{tid} eq "new") {
|
||||
$f->whatNext(
|
||||
-options=>{
|
||||
addTab=>WebGUI::International::get(103,"DataForm"),
|
||||
editTab=>WebGUI::International::get(103,"DataForm"),
|
||||
|
||||
backToPage=>WebGUI::International::get(745,"DataForm")
|
||||
""=>WebGUI::International::get(745,"DataForm")
|
||||
},
|
||||
-value=>"addTab"
|
||||
-value=>"editTab"
|
||||
);
|
||||
}
|
||||
$f->submit;
|
||||
|
|
@ -850,10 +846,6 @@ sub www_editTabSave {
|
|||
label=>$session{form}{label},
|
||||
subtext=>$session{form}{subtext}
|
||||
});
|
||||
if ($session{form}{proceed} eq "addTab") {
|
||||
$session{form}{tid} = "new";
|
||||
return $self->www_editTab();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,14 +29,6 @@ sub definition {
|
|||
fieldType=>"template",
|
||||
defaultValue=>"PBtmpl0000000000000034"
|
||||
},
|
||||
linkURL=>{
|
||||
fieldType=>'url',
|
||||
defaultValue=>undef
|
||||
},
|
||||
linkTitle=>{
|
||||
fieldType=>'text',
|
||||
defaultValue=>undef
|
||||
},
|
||||
indexName=>{
|
||||
fieldType=>'text',
|
||||
defaultValue=>'default'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue