Merge commit '808a866c8b' into webgui8. 7.9.4 release point
Conflicts: docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg docs/upgrades/upgrade_7.9.2-7.9.3.pl lib/WebGUI.pm lib/WebGUI/Asset/MapPoint.pm lib/WebGUI/Asset/Wobject/Calendar.pm lib/WebGUI/Asset/Wobject/Gallery.pm lib/WebGUI/Asset/Wobject/GalleryAlbum.pm lib/WebGUI/Asset/Wobject/WikiMaster.pm lib/WebGUI/AssetClipboard.pm lib/WebGUI/AssetVersioning.pm lib/WebGUI/Auth.pm t/Asset/Asset.t
This commit is contained in:
Colin Kuskie
commit
b30491f3a6
31 changed files with 1974 additions and 415 deletions
|
|
@ -51,6 +51,7 @@ use JSON qw();
|
|||
use WebGUI::International;
|
||||
use WebGUI::HTML;
|
||||
use WebGUI::ProgressBar;
|
||||
use WebGUI::Storage;
|
||||
|
||||
use Archive::Any;
|
||||
|
||||
|
|
@ -931,6 +932,7 @@ sub www_addArchive {
|
|||
$var->{ form_start }
|
||||
= WebGUI::Form::formHeader( $session, {
|
||||
action => $self->getUrl('func=addArchiveSave'),
|
||||
name => 'name="galleryAlbumAddArchive"',
|
||||
});
|
||||
$var->{ form_end }
|
||||
= WebGUI::Form::formFooter( $session );
|
||||
|
|
@ -1362,6 +1364,43 @@ sub www_edit {
|
|||
$session->errorHandler->error("Couldn't demote asset '$assetId' because we couldn't instantiate it.");
|
||||
}
|
||||
}
|
||||
# Rotate to the left
|
||||
elsif ( grep { $_ =~ /^rotateLeft-(.{22})$/ } $form->param ) {
|
||||
my $assetId = ( grep { $_ =~ /^rotateLeft-(.{22})$/ } $form->param )[0];
|
||||
$assetId =~ s/^rotateLeft-//;
|
||||
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
|
||||
|
||||
if ( $asset ) {
|
||||
# Add revision and create a new version tag by doing so
|
||||
my $newRevision = $asset->addRevision;
|
||||
# Rotate photo (i.e. all attached image files) by 90° CCW
|
||||
$newRevision->rotate(-90);
|
||||
# Auto-commit version tag
|
||||
$newRevision->requestAutoCommit;
|
||||
}
|
||||
else {
|
||||
$session->log->error("Couldn't rotate asset '$assetId' because we couldn't instantiate it.");
|
||||
}
|
||||
}
|
||||
# Rotate to the right
|
||||
elsif ( grep { $_ =~ /^rotateRight-(.{22})$/ } $form->param ) {
|
||||
my $assetId = ( grep { $_ =~ /^rotateRight-(.{22})$/ } $form->param )[0];
|
||||
$assetId =~ s/^rotateRight-//;
|
||||
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
|
||||
|
||||
if ( $asset ) {
|
||||
# Add revision and create a new version tag by doing so
|
||||
my $newRevision = $asset->addRevision;
|
||||
# Rotate photo (i.e. all attached image files) by 90° CW
|
||||
$newRevision->rotate(90);
|
||||
# Auto-commit version tag
|
||||
$newRevision->requestAutoCommit;
|
||||
}
|
||||
else {
|
||||
$session->log->error("Couldn't rotate asset '$assetId' because we couldn't instantiate it.");
|
||||
}
|
||||
}
|
||||
# Delete the file
|
||||
elsif ( grep { $_ =~ /^delete-(.{22})$/ } $form->param ) {
|
||||
my $assetId = ( grep { $_ =~ /^delete-(.{22})$/ } $form->param )[0];
|
||||
$assetId =~ s/^delete-//;
|
||||
|
|
@ -1381,6 +1420,7 @@ sub www_edit {
|
|||
$var->{ form_start }
|
||||
= WebGUI::Form::formHeader( $session, {
|
||||
action => $self->getParent->getUrl('func=editSave;assetId=new;class='.__PACKAGE__),
|
||||
extras => 'name="galleryAlbumAdd"',
|
||||
})
|
||||
. WebGUI::Form::hidden( $session, {
|
||||
name => "ownerUserId",
|
||||
|
|
@ -1399,6 +1439,7 @@ sub www_edit {
|
|||
$var->{ form_start }
|
||||
= WebGUI::Form::formHeader( $session, {
|
||||
action => $self->getUrl('func=edit'),
|
||||
extras => 'name="galleryAlbumEdit"',
|
||||
})
|
||||
. WebGUI::Form::hidden( $session, {
|
||||
name => "ownerUserId",
|
||||
|
|
@ -1460,23 +1501,44 @@ sub www_edit {
|
|||
id => "assetIdThumbnail_$file->{ assetId }",
|
||||
} );
|
||||
|
||||
# Raw HTML here to provide proper value for the image
|
||||
my $promoteLabel = $i18n->get( 'Move Up', 'Icon' );
|
||||
$file->{ form_promote }
|
||||
= qq{<input type="submit" name="promote-$file->{assetId}" class="promote" value="$promoteLabel" />}
|
||||
;
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "promote-$file->{assetId}",
|
||||
value => $i18n->get( 'Move Up', 'Icon' ),
|
||||
class => "promote",
|
||||
});
|
||||
|
||||
my $demoteLabel = $i18n->get( 'Move Down', 'Icon' );
|
||||
$file->{ form_demote }
|
||||
= qq{<input type="submit" name="demote-$file->{assetId}" class="demote" value="$demoteLabel" />}
|
||||
;
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "demote-$file->{assetId}",
|
||||
value => $i18n->get( 'Move Down', 'Icon' ),
|
||||
class => "demote",
|
||||
});
|
||||
|
||||
my $deleteConfirm = $i18n->get( 'template delete message', 'Asset_Photo' );
|
||||
my $deleteLabel = $i18n->get( 'Delete', 'Icon' );
|
||||
$file->{ form_delete }
|
||||
= qq{<input type="submit" name="delete-$file->{assetId}" class="delete" value="$deleteLabel" }
|
||||
. qq{ onclick="return confirm('$deleteConfirm')" />}
|
||||
;
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "delete-$file->{assetId}",
|
||||
value => $i18n->get( 'Delete', 'Icon' ),
|
||||
class => "delete",
|
||||
extras => "onclick=\"return confirm('$deleteConfirm')\"",
|
||||
});
|
||||
|
||||
$file->{ form_rotateLeft }
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "rotateLeft-$file->{assetId}",
|
||||
value => $i18n->get( 'rotate left' ),
|
||||
class => "rotateLeft",
|
||||
});
|
||||
|
||||
$file->{ form_rotateRight }
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "rotateRight-$file->{assetId}",
|
||||
value => $i18n->get( 'rotate right' ),
|
||||
class => "rotateRight",
|
||||
});
|
||||
|
||||
$file->{ form_synopsis }
|
||||
= WebGUI::Form::HTMLArea( $session, {
|
||||
|
|
|
|||
|
|
@ -188,6 +188,8 @@ use WebGUI::International;
|
|||
use HTML::Parser;
|
||||
use URI::Escape;
|
||||
use WebGUI::Utility qw/isIn/;
|
||||
use WebGUI::Form;
|
||||
use Clone qw/clone/;
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
|
|
@ -209,12 +211,29 @@ sub appendFeaturedPageVars {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 appendKeywordPageVars ( var )
|
||||
|
||||
Append the template variables to C<var> for keyword (catagory) pages.
|
||||
|
||||
=cut
|
||||
|
||||
sub appendKeywordPageVars {
|
||||
my ( $self, $var ) = @_;
|
||||
my $session = $self->session;
|
||||
my $topKeywords = $self->getTopLevelKeywordsList;
|
||||
my $keywordHierarchy = $self->getKeywordHierarchy( $topKeywords, );
|
||||
$var->{keywords_loop} = $self->getKeywordVariables( $keywordHierarchy );
|
||||
return $var;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 appendMostPopular ($var, [ $limit ])
|
||||
|
||||
=head3 $var
|
||||
|
||||
A hash reference of template variables. An array reference containing the most popular wiki pages
|
||||
in order of popularity.
|
||||
in order of popularity will be appended to it.
|
||||
|
||||
=head3 $limit
|
||||
|
||||
|
|
@ -441,6 +460,180 @@ sub canEditPages {
|
|||
return $self->session->user->isInGroup($self->groupToEditPages) || $self->canAdminister;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub definition {
|
||||
my $class = shift;
|
||||
my $session = shift;
|
||||
my $definition = shift;
|
||||
my $i18n = WebGUI::International->new($session, 'Asset_WikiMaster');
|
||||
|
||||
my %properties;
|
||||
tie %properties, 'Tie::IxHash';
|
||||
%properties =
|
||||
(
|
||||
groupToEditPages => { fieldType => 'group',
|
||||
defaultValue => ['2'],
|
||||
tab => 'security',
|
||||
hoverHelp => $i18n->get('groupToEditPages hoverHelp'),
|
||||
label => $i18n->get('groupToEditPages label') },
|
||||
|
||||
groupToAdminister => { fieldType => 'group',
|
||||
defaultValue => ['3'],
|
||||
tab => 'security',
|
||||
hoverHelp => $i18n->get('groupToAdminister hoverHelp'),
|
||||
label => $i18n->get('groupToAdminister label') },
|
||||
|
||||
richEditor => { fieldType => 'selectRichEditor',
|
||||
defaultValue => 'PBrichedit000000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('richEditor hoverHelp'),
|
||||
label => $i18n->get('richEditor label') },
|
||||
|
||||
frontPageTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiMaster_front',
|
||||
defaultValue => 'WikiFrontTmpl000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('frontPageTemplateId hoverHelp'),
|
||||
label => $i18n->get('frontPageTemplateId label') },
|
||||
|
||||
pageTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiPage',
|
||||
defaultValue => 'WikiPageTmpl0000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('pageTemplateId hoverHelp'),
|
||||
label => $i18n->get('pageTemplateId label') },
|
||||
|
||||
pageHistoryTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiPage_pageHistory',
|
||||
defaultValue => 'WikiPHTmpl000000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('pageHistoryTemplateId hoverHelp'),
|
||||
label => $i18n->get('pageHistoryTemplateId label') },
|
||||
|
||||
mostPopularTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiMaster_mostPopular',
|
||||
defaultValue => 'WikiMPTmpl000000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('mostPopularTemplateId hoverHelp'),
|
||||
label => $i18n->get('mostPopularTemplateId label') },
|
||||
|
||||
recentChangesTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiMaster_recentChanges',
|
||||
defaultValue => 'WikiRCTmpl000000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('recentChangesTemplateId hoverHelp'),
|
||||
label => $i18n->get('recentChangesTemplateId label') },
|
||||
|
||||
byKeywordTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiMaster_byKeyword',
|
||||
defaultValue => 'WikiKeyword00000000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('byKeywordTemplateId hoverHelp'),
|
||||
label => $i18n->get('byKeywordTemplateId label') },
|
||||
|
||||
searchTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiMaster_search',
|
||||
defaultValue => 'WikiSearchTmpl00000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('searchTemplateId hoverHelp'),
|
||||
label => $i18n->get('searchTemplateId label') },
|
||||
|
||||
pageEditTemplateId => { fieldType => 'template',
|
||||
namespace => 'WikiPage_edit',
|
||||
defaultValue => 'WikiPageEditTmpl000001',
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('pageEditTemplateId hoverHelp'),
|
||||
label => $i18n->get('pageEditTemplateId label') },
|
||||
|
||||
recentChangesCount => { fieldType => 'integer',
|
||||
defaultValue => 50,
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('recentChangesCount hoverHelp'),
|
||||
label => $i18n->get('recentChangesCount label') },
|
||||
|
||||
recentChangesCountFront => { fieldType => 'integer',
|
||||
defaultValue => 10,
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('recentChangesCountFront hoverHelp'),
|
||||
label => $i18n->get('recentChangesCountFront label') },
|
||||
|
||||
mostPopularCount => { fieldType => 'integer',
|
||||
defaultValue => 50,
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('mostPopularCount hoverHelp'),
|
||||
label => $i18n->get('mostPopularCount label') },
|
||||
|
||||
mostPopularCountFront => { fieldType => 'integer',
|
||||
defaultValue => 10,
|
||||
tab => 'display',
|
||||
hoverHelp => $i18n->get('mostPopularCountFront hoverHelp'),
|
||||
label => $i18n->get('mostPopularCountFront label') },
|
||||
approvalWorkflow =>{
|
||||
fieldType=>"workflow",
|
||||
defaultValue=>"pbworkflow000000000003",
|
||||
type=>'WebGUI::VersionTag',
|
||||
tab=>'security',
|
||||
label=>$i18n->get('approval workflow'),
|
||||
hoverHelp=>$i18n->get('approval workflow description'),
|
||||
},
|
||||
thumbnailSize => {
|
||||
fieldType => "integer",
|
||||
defaultValue => 0,
|
||||
tab => "display",
|
||||
label => $i18n->get("thumbnail size"),
|
||||
hoverHelp => $i18n->get("thumbnail size help")
|
||||
},
|
||||
maxImageSize => {
|
||||
fieldType => "integer",
|
||||
defaultValue => 0,
|
||||
tab => "display",
|
||||
label => $i18n->get("max image size"),
|
||||
hoverHelp => $i18n->get("max image size help")
|
||||
},
|
||||
allowAttachments => {
|
||||
fieldType => "integer",
|
||||
defaultValue => 0,
|
||||
tab => "security",
|
||||
label => $i18n->get("allow attachments"),
|
||||
hoverHelp => $i18n->get("allow attachments help"),
|
||||
},
|
||||
useContentFilter =>{
|
||||
fieldType=>"yesNo",
|
||||
defaultValue=>1,
|
||||
tab=>'display',
|
||||
label=>$i18n->get('content filter'),
|
||||
hoverHelp=>$i18n->get('content filter description'),
|
||||
},
|
||||
filterCode =>{
|
||||
fieldType=>"filterContent",
|
||||
defaultValue=>'javascript',
|
||||
tab=>'security',
|
||||
label=>$i18n->get('filter code'),
|
||||
hoverHelp=>$i18n->get('filter code description'),
|
||||
},
|
||||
topLevelKeywords =>{
|
||||
fieldType => "keywords",
|
||||
defaultValue => '',
|
||||
tab => 'properties',
|
||||
label => $i18n->get('top level keywords'),
|
||||
hoverHelp => $i18n->get('top level keywords description'),
|
||||
},
|
||||
);
|
||||
|
||||
push @$definition,
|
||||
{
|
||||
assetName => $i18n->get('assetName'),
|
||||
icon => 'wikiMaster.gif',
|
||||
autoGenerateForms => 1,
|
||||
tableName => 'WikiMaster',
|
||||
className => 'WebGUI::Asset::Wobject::WikiMaster',
|
||||
properties => \%properties,
|
||||
};
|
||||
|
||||
return $class->next::method($session, $definition);
|
||||
>>>>>>> 808a866c8b2a426e4958d38c34e8753a8555fc90
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getFeaturedPageIds ( )
|
||||
|
|
@ -462,6 +655,108 @@ sub getFeaturedPageIds {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getKeywordHierarchy ( $keywords, $seen )
|
||||
|
||||
Starting with the top level keywords, return the hierarchy of keywords as a recursive arrayref of hashrefs.
|
||||
The traversal is left-most, depth first.
|
||||
|
||||
The hierarchy data structure that looks like this:
|
||||
|
||||
[
|
||||
{
|
||||
title => 'title', # same as the keyword, since this is a keyword (category) page
|
||||
url => 'url', # url from the keyword page, via getUrl so it contains the gateway URL
|
||||
# If a keyword page does not exist for the keyword, this key/value pair will not be present.
|
||||
children => [ # Array reference of sub-categories referenced by this category
|
||||
{ # If there are no children, this key/value pair will not be present
|
||||
...
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
=head3 $keywords
|
||||
|
||||
An array reference of keywords. If this is blank, then it will use the top level keywords from
|
||||
itself as a default.
|
||||
|
||||
=head3 $seen
|
||||
|
||||
A hash reference that keeps track of which keywords have already been seen. This prevents
|
||||
infinite loops from happening during the traversal.
|
||||
|
||||
=cut
|
||||
|
||||
sub getKeywordHierarchy {
|
||||
my ( $self, $keywords, $seen ) = @_;
|
||||
my $session = $self->session;
|
||||
my $hierarchy = [];
|
||||
$keywords ||= $self->getTopLevelKeywordsList;
|
||||
$seen ||= {};
|
||||
KEYWORD: foreach my $keyword (sort @{ $keywords }) {
|
||||
my $page = $self->getLineage(['children'], {
|
||||
returnObjects => 1,
|
||||
whereClause => 'assetData.title = '.$session->db->quote($keyword),
|
||||
limit => 1,
|
||||
includeOnlyClasses => [qw/WebGUI::Asset::WikiPage/],
|
||||
})->[0];
|
||||
if (! $page) {
|
||||
push @{ $hierarchy }, { title => $keyword, url => '', };
|
||||
next KEYWORD;
|
||||
}
|
||||
my $datum = {
|
||||
title => $keyword, ##Note, same as keyword
|
||||
url => $page->getUrl,
|
||||
};
|
||||
##Prevent recursion if seen again
|
||||
if (! $seen->{$keyword}++) {
|
||||
my $children = $self->getKeywordHierarchy(WebGUI::Keyword::string2list($page->get('keywords')), $seen, );
|
||||
if (@{ $children } ) {
|
||||
$datum->{children} = $children;
|
||||
}
|
||||
}
|
||||
push @{ $hierarchy }, $datum;
|
||||
}
|
||||
return $hierarchy;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getKeywordVariables ( $hierarchy, $level )
|
||||
|
||||
Take a data structure representing a hierarchy of keywords, and append template variables
|
||||
to them similar to a Navigation so you can build useful things with them.
|
||||
|
||||
=head3 $hierarchy
|
||||
|
||||
A data structure similar to that produced by getKeywordHierarchy
|
||||
|
||||
=head3 $level
|
||||
|
||||
The current level in any part of the hierarchy.
|
||||
|
||||
=cut
|
||||
|
||||
sub getKeywordVariables {
|
||||
my ( $self, $hierarchy, $level ) = @_;
|
||||
$level ||= 0;
|
||||
my $variables = [];
|
||||
|
||||
KEYWORD: foreach my $member (@{ $hierarchy }) {
|
||||
my $varBlock = clone $member;
|
||||
$varBlock->{level} = $level;
|
||||
$varBlock->{indent_loop} = [ map { { indent => $_ } } 1..$level ];
|
||||
delete $varBlock->{children};
|
||||
push @{$variables}, $varBlock;
|
||||
if ( exists $member->{children} ) {
|
||||
push @{$variables}, @{ $self->getKeywordVariables($member->{children}, $level+1) };
|
||||
}
|
||||
}
|
||||
return $variables;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getRssFeedItems ()
|
||||
|
||||
Returns an array reference of hash references. Each hash reference has a title,
|
||||
|
|
@ -521,6 +816,19 @@ sub getTemplateVars {
|
|||
return $var;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
=head2 getTopLevelKeywordsList ( )
|
||||
|
||||
Return the top level keywords as an array reference.
|
||||
|
||||
=cut
|
||||
|
||||
sub getTopLevelKeywordsList {
|
||||
my ( $self ) = @_;
|
||||
return WebGUI::Keyword::string2list($self->get('topLevelKeywords'));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 prepareView
|
||||
|
|
@ -611,6 +919,7 @@ sub view {
|
|||
$self->appendSearchBoxVars($var);
|
||||
$self->appendRecentChanges($var, $self->recentChangesCountFront);
|
||||
$self->appendMostPopular($var, $self->mostPopularCountFront);
|
||||
$self->appendKeywordPageVars($var);
|
||||
return $self->processTemplate($var, undef, $template);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue