Matrix bugfixes and code cleanup
This commit is contained in:
Yung Han Khoe
parent
ee2e0ad48d
commit
b0204d51d6
2 changed files with 84 additions and 81 deletions
|
|
@ -26,27 +26,14 @@ use base 'WebGUI::Asset::Wobject';
|
|||
|
||||
Returns true if able to add MatrixListings.
|
||||
|
||||
Checks to make sure that the
|
||||
Calendar has been committed at least once. Checks to make sure that
|
||||
the user is in the appropriate group (either the group that can edit
|
||||
the calendar, or the group that can edit events in the calendar).
|
||||
|
||||
=cut
|
||||
|
||||
sub canAddMatrixListing {
|
||||
my $self = shift;
|
||||
|
||||
return 0 if $self->session->user->isVisitor;
|
||||
|
||||
return 1;
|
||||
# my $userId = shift;
|
||||
#
|
||||
# my $user = $userId
|
||||
# ? WebGUI::User->new( $self->session, $userId )
|
||||
# : $self->session->user
|
||||
# ;
|
||||
#
|
||||
# return 1 if (
|
||||
# $user->isInGroup( $self->get("groupIdEventEdit") )
|
||||
# );
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -66,15 +53,15 @@ sub definition {
|
|||
my %properties;
|
||||
tie %properties, 'Tie::IxHash';
|
||||
%properties = (
|
||||
templateId =>{
|
||||
fieldType =>"template",
|
||||
defaultValue =>'matrixtmpl000000000001',
|
||||
tab =>"display",
|
||||
noFormPost =>0,
|
||||
namespace =>"Matrix",
|
||||
hoverHelp =>$i18n->get('template description'),
|
||||
label =>$i18n->get('template label'),
|
||||
},
|
||||
templateId =>{
|
||||
fieldType =>"template",
|
||||
defaultValue =>'matrixtmpl000000000001',
|
||||
tab =>"display",
|
||||
noFormPost =>0,
|
||||
namespace =>"Matrix",
|
||||
hoverHelp =>$i18n->get('template description'),
|
||||
label =>$i18n->get('template label'),
|
||||
},
|
||||
searchTemplateId=>{
|
||||
defaultValue =>"matrixtmpl000000000005",
|
||||
fieldType =>"template",
|
||||
|
|
@ -214,7 +201,6 @@ sub deleteAttribute {
|
|||
my $attributeId = shift;
|
||||
|
||||
$self->deleteCollateral("Matrix_attribute","attributeId",$attributeId);
|
||||
#TODO: delete listing data, $self->deleteCollateral("Matrix_listingData","attributeId",$attributeId);
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
|
@ -287,10 +273,12 @@ sub getCategories {
|
|||
my $self = shift;
|
||||
my %categories;
|
||||
tie %categories, 'Tie::IxHash';
|
||||
my $categories = $self->getValue("categories");
|
||||
$categories =~ s/\r//g;
|
||||
|
||||
my $categories = $self->getValue("categories");
|
||||
$categories =~ s/\r//g;
|
||||
chomp($categories);
|
||||
my @categories = split(/\n/,$categories);
|
||||
|
||||
my @categories = split(/\n/,$categories);
|
||||
foreach my $category (@categories) {
|
||||
$categories{$category} = $category;
|
||||
}
|
||||
|
|
@ -302,7 +290,7 @@ sub getCategories {
|
|||
|
||||
=head2 getCompareColor ( )
|
||||
|
||||
Returns the compare form.
|
||||
Returns the compare color for a MatrixCompare value.
|
||||
|
||||
=head3 value
|
||||
|
||||
|
|
@ -339,10 +327,6 @@ sub getCompareColor {
|
|||
|
||||
Returns the compare form.
|
||||
|
||||
=head3 selectedListingIds
|
||||
|
||||
An array of listingIds that should be selected in the compare form.
|
||||
|
||||
=cut
|
||||
|
||||
sub getCompareForm {
|
||||
|
|
@ -371,8 +355,6 @@ sub getCompareForm {
|
|||
return $form;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getEditForm ( )
|
||||
|
|
@ -382,7 +364,7 @@ returns the tabform object that will be used in generating the edit page for Mat
|
|||
=cut
|
||||
|
||||
sub getEditForm {
|
||||
my $self = shift;
|
||||
my $self = shift;
|
||||
my $tabform = $self->SUPER::getEditForm();
|
||||
return $tabform;
|
||||
}
|
||||
|
|
@ -397,10 +379,13 @@ See WebGUI::Asset::prepareView() for details.
|
|||
|
||||
sub prepareView {
|
||||
my $self = shift;
|
||||
|
||||
$self->SUPER::prepareView();
|
||||
my $template = WebGUI::Asset::Template->new($self->session, $self->get("templateId"));
|
||||
$template->prepare;
|
||||
$self->{_viewTemplate} = $template;
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -611,13 +596,17 @@ assetData.revisionDate
|
|||
|
||||
Returns the compare screen
|
||||
|
||||
=head3 listingIds
|
||||
|
||||
An array of listingIds that should be selected in the compare form.
|
||||
|
||||
=cut
|
||||
|
||||
sub www_compare {
|
||||
|
||||
my $self = shift;
|
||||
my $var = $self->get;
|
||||
my @listingIds = @_;
|
||||
my $self = shift;
|
||||
my $var = $self->get;
|
||||
my @listingIds = @_;
|
||||
my @responseFields;
|
||||
|
||||
unless (scalar(@listingIds)) {
|
||||
|
|
@ -683,8 +672,9 @@ Deletes an Attribute, including listing data for this attribute.
|
|||
=cut
|
||||
|
||||
sub www_deleteAttribute {
|
||||
my $self = shift;
|
||||
my $self = shift;
|
||||
my $attributeId = $self->session->form->process("attributeId");
|
||||
|
||||
return $self->session->privilege->insufficient() unless $self->canEdit;
|
||||
|
||||
$self->deleteAttribute($attributeId);
|
||||
|
|
@ -719,7 +709,7 @@ Shows a form to edit or add an attribute.
|
|||
=cut
|
||||
|
||||
sub www_editAttribute {
|
||||
my $self = shift;
|
||||
my $self = shift;
|
||||
my $session = $self->session;
|
||||
my ($attributeId, $attribute);
|
||||
|
||||
|
|
@ -762,9 +752,6 @@ sub www_editAttribute {
|
|||
my $defaultValueForm = WebGUI::Form::Text($self->session, {
|
||||
name=>"defaultValue",
|
||||
value=>$attribute->{defaultValue},
|
||||
#subtext=>'<br />'.$i18n->get('default value subtext'),
|
||||
#width=>200,
|
||||
#height=>60,
|
||||
resizable=>0,
|
||||
});
|
||||
my $optionsForm = WebGUI::Form::Textarea($self->session, {
|
||||
|
|
@ -865,9 +852,9 @@ Exports search attributes as csv.
|
|||
=cut
|
||||
|
||||
sub www_exportAttributes {
|
||||
my $self = shift;
|
||||
my $self = shift;
|
||||
my $session = $self->session;
|
||||
my $output = WebGUI::Text::joinCSV("name","description","category");
|
||||
my $output = WebGUI::Text::joinCSV("name","description","category");
|
||||
|
||||
my $attributes = $session->db->read("select name, description, category
|
||||
from Matrix_attribute where assetId = ? order by category, name",[$self->getId]);
|
||||
|
|
@ -875,6 +862,7 @@ sub www_exportAttributes {
|
|||
while (my $attribute = $attributes->hashRef) {
|
||||
$output .= "\n".WebGUI::Text::joinCSV($attribute->{name},$attribute->{description},$attribute->{category});
|
||||
}
|
||||
|
||||
my $fileName = "export_matrix_attributes.csv";
|
||||
$self->session->http->setFilename($fileName,"application/octet-stream");
|
||||
$self->session->http->sendHeader;
|
||||
|
|
@ -887,6 +875,10 @@ sub www_exportAttributes {
|
|||
|
||||
Returns the compare form data as JSON.
|
||||
|
||||
=head3 sort
|
||||
|
||||
The criterium by which the listings should be sorted.
|
||||
|
||||
=cut
|
||||
|
||||
sub www_getCompareFormData {
|
||||
|
|
@ -951,19 +943,17 @@ assetData.revisionDate
|
|||
left join Matrix_attribute using(attributeId)
|
||||
where listing.attributeId = ? and listing.matrixListingId = ?
|
||||
",[$attributeId,$result->{assetId}]);
|
||||
$self->session->errorHandler->warn("fieldType:".$fieldType.", attributeValue: ".$form->process($param).", listingvalue: ".$listingValue);
|
||||
#$self->session->errorHandler->warn("fieldType:".$fieldType.", attributeValue: ".$form->process($param).", listingvalue: ".$listingValue);
|
||||
if(($fieldType eq 'MatrixCompare') && ($listingValue < $form->process($param))){
|
||||
#undef $result->{checked};
|
||||
$result->{checked} = '';
|
||||
last;
|
||||
}
|
||||
elsif(($fieldType ne 'MatrixCompare') && ($form->process($param) ne $listingValue)){
|
||||
#undef $result->{checked};
|
||||
$result->{checked} = '';
|
||||
last;
|
||||
}
|
||||
else{
|
||||
$self->session->errorHandler->warn("--Checked--");
|
||||
#$self->session->errorHandler->warn("--Checked--");
|
||||
$result->{checked} = 'checked';
|
||||
}
|
||||
}
|
||||
|
|
@ -977,12 +967,6 @@ assetData.revisionDate
|
|||
}
|
||||
$result->{assetId} =~ s/-/_____/g;
|
||||
$result->{url} = "/".$result->{url};
|
||||
#$result->{checkBox} = "<input type='checkbox' name='listingId' value='".$result->{assetId}
|
||||
# ."' id='".$result->{assetId}."_checkBox' ";
|
||||
#if($result->{checked}){
|
||||
# $result->{checkBox} .= " checked='checked'";
|
||||
#}
|
||||
#$result->{checkBox} .= " onChange='javascript:compareFormButton()' class='compareCheckBox'>";
|
||||
}
|
||||
|
||||
my $jsonOutput;
|
||||
|
|
@ -997,19 +981,23 @@ assetData.revisionDate
|
|||
|
||||
Returns the compare list data as JSON.
|
||||
|
||||
=head3 listingIds
|
||||
|
||||
An array of listingIds that should be shown in the compare list datatable.
|
||||
|
||||
=cut
|
||||
|
||||
sub www_getCompareListData {
|
||||
|
||||
my $self = shift;
|
||||
my @listingIds = @_;
|
||||
my $self = shift;
|
||||
my @listingIds = @_;
|
||||
my $session = $self->session;
|
||||
my (@results,@columnDefs);
|
||||
|
||||
unless (scalar(@listingIds)) {
|
||||
@listingIds = $self->session->form->checkList("listingId");
|
||||
}
|
||||
|
||||
my $session = $self->session;
|
||||
my (@results,$results,@columnDefs);
|
||||
#my $sortDirection = ' asc';
|
||||
|
||||
foreach my $listingId (@listingIds){
|
||||
$listingId =~ s/_____/-/g;
|
||||
|
|
@ -1043,24 +1031,24 @@ sub www_getCompareListData {
|
|||
}
|
||||
foreach my $result (@results){
|
||||
unless($result->{fieldType} eq 'category'){
|
||||
foreach my $listingId (@listingIds) {
|
||||
$result->{attributeId} =~ s/-/_____/g;
|
||||
my $listingId_safe = $listingId;
|
||||
$listingId_safe =~ s/-/_____/g;
|
||||
if ($result->{fieldType} eq 'MatrixCompare'){
|
||||
my $originalValue = $result->{$listingId_safe};
|
||||
$result->{$listingId_safe.'_compareColor'} = $self->getCompareColor($result->{$listingId_safe});
|
||||
$result->{$listingId_safe} = WebGUI::Form::MatrixCompare->new( $self->session,
|
||||
{ value=>$result->{$listingId_safe} },defaultValue=>0)->getValueAsHtml;
|
||||
foreach my $listingId (@listingIds) {
|
||||
$result->{attributeId} =~ s/-/_____/g;
|
||||
my $listingId_safe = $listingId;
|
||||
$listingId_safe =~ s/-/_____/g;
|
||||
if ($result->{fieldType} eq 'MatrixCompare'){
|
||||
my $originalValue = $result->{$listingId_safe};
|
||||
$result->{$listingId_safe.'_compareColor'} = $self->getCompareColor($result->{$listingId_safe});
|
||||
$result->{$listingId_safe} = WebGUI::Form::MatrixCompare->new( $self->session,
|
||||
{ value=>$result->{$listingId_safe} },defaultValue=>0)->getValueAsHtml;
|
||||
}
|
||||
if($session->scratch->get('stickied_'.$result->{attributeId})){
|
||||
$self->session->errorHandler->warn("found checked stickie: ".$result->{attributeId});
|
||||
$result->{checked} = 'checked';
|
||||
}
|
||||
else{
|
||||
$result->{checked} = '';
|
||||
}
|
||||
}
|
||||
if($session->scratch->get('stickied_'.$result->{attributeId})){
|
||||
$self->session->errorHandler->warn("found checked stickie: ".$result->{attributeId});
|
||||
$result->{checked} = 'checked';
|
||||
}
|
||||
else{
|
||||
$result->{checked} = '';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue