fixed one i18n thing, and some formatting.
This commit is contained in:
parent
58aa7c3f5b
commit
c8873ea6e2
1 changed files with 44 additions and 43 deletions
|
|
@ -76,30 +76,30 @@ A hash reference passed in from a subclass definition.
|
||||||
=cut
|
=cut
|
||||||
|
|
||||||
sub definition {
|
sub definition {
|
||||||
my $class = shift;
|
my $class = shift;
|
||||||
my $definition = shift;
|
my $definition = shift;
|
||||||
push(@{$definition}, {
|
push(@{$definition}, {
|
||||||
assetName=>WebGUI::International::get('assetName',"Asset_File"),
|
assetName=>WebGUI::International::get('assetName',"Asset_File"),
|
||||||
tableName=>'FileAsset',
|
tableName=>'FileAsset',
|
||||||
className=>'WebGUI::Asset::File',
|
className=>'WebGUI::Asset::File',
|
||||||
properties=>{
|
properties=>{
|
||||||
filename=>{
|
filename=>{
|
||||||
noFormPost=>1,
|
noFormPost=>1,
|
||||||
fieldType=>'hidden',
|
fieldType=>'hidden',
|
||||||
defaultValue=>undef
|
defaultValue=>undef
|
||||||
},
|
},
|
||||||
storageId=>{
|
storageId=>{
|
||||||
noFormPost=>1,
|
noFormPost=>1,
|
||||||
fieldType=>'hidden',
|
fieldType=>'hidden',
|
||||||
defaultValue=>undef
|
defaultValue=>undef
|
||||||
},
|
},
|
||||||
templateId=>{
|
templateId=>{
|
||||||
fieldType=>'template',
|
fieldType=>'template',
|
||||||
defaultValue=>'PBtmpl0000000000000024'
|
defaultValue=>'PBtmpl0000000000000024'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return $class->SUPER::definition($definition);
|
return $class->SUPER::definition($definition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -137,13 +137,13 @@ sub getEditForm {
|
||||||
-label=>WebGUI::International::get('current file', 'Asset_File'),
|
-label=>WebGUI::International::get('current file', 'Asset_File'),
|
||||||
-hoverHelp=>WebGUI::International::get('current file description', 'Asset_File'),
|
-hoverHelp=>WebGUI::International::get('current file description', 'Asset_File'),
|
||||||
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" border="0" align="middle" /> '.$self->get("filename").'</a>'
|
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" border="0" align="middle" /> '.$self->get("filename").'</a>'
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
$tabform->getTab("properties")->file(
|
$tabform->getTab("properties")->file(
|
||||||
-label=>WebGUI::International::get('new file', 'Asset_File'),
|
-label=>WebGUI::International::get('new file', 'Asset_File'),
|
||||||
-hoverHelp=>WebGUI::International::get('new file description', 'Asset_File'),
|
-hoverHelp=>WebGUI::International::get('new file description', 'Asset_File'),
|
||||||
);
|
);
|
||||||
return $tabform;
|
return $tabform;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -250,16 +250,16 @@ We override the update method from WebGUI::Asset in order to handle file system
|
||||||
=cut
|
=cut
|
||||||
|
|
||||||
sub update {
|
sub update {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my %before = (
|
my %before = (
|
||||||
owner => $self->get("ownerUserId"),
|
owner => $self->get("ownerUserId"),
|
||||||
view => $self->get("groupIdView"),
|
view => $self->get("groupIdView"),
|
||||||
edit => $self->get("groupIdEdit")
|
edit => $self->get("groupIdEdit")
|
||||||
);
|
);
|
||||||
$self->SUPER::update(@_);
|
$self->SUPER::update(@_);
|
||||||
if ($self->get("ownerUserId") ne $before{owner} || $self->get("groupIdEdit") ne $before{edit} || $self->get("groupIdView") ne $before{view}) {
|
if ($self->get("ownerUserId") ne $before{owner} || $self->get("groupIdEdit") ne $before{edit} || $self->get("groupIdView") ne $before{view}) {
|
||||||
$self->getStorageLocation->setPrivileges($self->get("ownerUserId"),$self->get("groupIdView"),$self->get("groupIdEdit"));
|
$self->getStorageLocation->setPrivileges($self->get("ownerUserId"),$self->get("groupIdView"),$self->get("groupIdEdit"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
|
|
@ -275,19 +275,20 @@ sub view {
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
sub www_edit {
|
sub www_edit {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
return WebGUI::Privilege::insufficient() unless $self->canEdit;
|
return WebGUI::Privilege::insufficient() unless $self->canEdit;
|
||||||
my $tabform = $self->getEditForm;
|
my $tabform = $self->getEditForm;
|
||||||
$tabform->getTab("display")->template(
|
$tabform->getTab("display")->template(
|
||||||
-value=>$self->getValue("templateId"),
|
-value=>$self->getValue("templateId"),
|
||||||
-hoverHelp=>WebGUI::International::get('file template description','Asset_Image'),
|
-hoverHelp=>WebGUI::International::get('file template description','Asset_Image'),
|
||||||
-namespace=>"FileAsset"
|
-namespace=>"FileAsset"
|
||||||
);
|
);
|
||||||
$self->getAdminConsole->setHelp("file add/edit", "Asset_File");
|
$self->getAdminConsole->setHelp("file add/edit", "Asset_File");
|
||||||
return $self->getAdminConsole->render($tabform->print,"Edit File");
|
my $addEdit = ($session{form}{func} eq 'add') ? WebGUI::International::get('add','Wobject') : WebGUI::International::get('edit','Wobject');
|
||||||
|
return $self->getAdminConsole->render($tabform->print,$addEdit.' '.$self->getName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------
|
||||||
sub www_view {
|
sub www_view {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
return WebGUI::Privilege::noAccess() unless $self->canView;
|
return WebGUI::Privilege::noAccess() unless $self->canView;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue