oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing's Roy's booger.

Browse source
This commit is contained in:
Matthew Wilson 2006-04-23 00:48:41 +00:00
parent 2e0da40b11
commit 2cf975700d
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -107,7 +107,7 @@ sub _getFieldHash {
compare=>"boolean", compare=>"boolean",
method=>"selectBox", method=>"selectBox",
calculated=>1, calculated=>1,
initial=>1 initial=>0
} }
); );
# Add custom metadata fields to the list, matching the types up # Add custom metadata fields to the list, matching the types up
@ -125,7 +125,7 @@ sub _getFieldHash {
$type = 'select'; $type = 'select';
} }
$hash{$field->{fieldId}} = { $hash{$field->{fieldId}} = {
name=>$field->{name}, name=>$field->{label},
type=>$type, type=>$type,
method=>$dataType, method=>$dataType,
initial=>$field->{autoSearch}, initial=>$field->{autoSearch},
@ -263,6 +263,7 @@ sub buildMenu {
my $js = "var filterList = {\n"; my $js = "var filterList = {\n";
foreach my $fieldId (keys %{$fields}) { foreach my $fieldId (keys %{$fields}) {
my $field = $fields->{$fieldId}; my $field = $fields->{$fieldId};
next if $fieldId eq 'requirement';
$js .= ",\n" if($counter++ > 0); $js .= ",\n" if($counter++ > 0);
my $fieldName = $field->{name}; my $fieldName = $field->{name};
my $fieldType = $field->{type}; my $fieldType = $field->{type};
@ -1717,8 +1718,7 @@ sub www_editEvent {
} }
$f->dynamicField( $f->dynamicField(
name=>"metadata_".$meta->{$field->{fieldId}}{fieldId}, name=>"metadata_".$meta->{$field->{fieldId}}{fieldId},
label=>$meta->{$field->{fieldId}}{name}, label=>$meta->{$field->{fieldId}}{label},
hoverHelp=>$meta->{$field->{fieldId}}{label},
value=>($self->session->form->process("metadata_".$meta->{$field->{fieldId}}{fieldId},$dataType) || $meta->{$field->{fieldId}}{fieldData}), value=>($self->session->form->process("metadata_".$meta->{$field->{fieldId}}{fieldId},$dataType) || $meta->{$field->{fieldId}}{fieldData}),
extras=>qq/title="$meta->{$field->{fieldId}}{label}"/, extras=>qq/title="$meta->{$field->{fieldId}}{label}"/,
possibleValues=>$meta->{$field->{fieldId}}{possibleValues}, possibleValues=>$meta->{$field->{fieldId}}{possibleValues},
@ -2207,8 +2207,8 @@ sub www_editEventMetaDataField {
); );
$f->yesNo( $f->yesNo(
-name => "autoSearch", -name => "autoSearch",
-label => $i18n->get('auto search'), -label => $i18n2->get('auto search'),
-hoverHelp => $i18n->get('auto search description'), -hoverHelp => $i18n2->get('auto search description'),
-value => $data->{autoSearch}, -value => $data->{autoSearch},
); );
my %hash; my %hash;
@ -2380,7 +2380,7 @@ sub www_savePrerequisites {
my $instance = WebGUI::Workflow::Instance->create($self->session, { my $instance = WebGUI::Workflow::Instance->create($self->session, {
workflowId=>'EMSworkflow00000000001' workflowId=>'EMSworkflow00000000001'
},'EMSinstance00000000001'); });
return $self->www_editEvent(undef,$eventToAssignPrereqTo); return $self->www_editEvent(undef,$eventToAssignPrereqTo);
} }
@ -2531,17 +2531,7 @@ sub www_search {
# If we're at the view method there is no reason we should have anything in our scratch cart # If we're at the view method there is no reason we should have anything in our scratch cart
# so let's empty it to prevent strange and awful things from happening # so let's empty it to prevent strange and awful things from happening
<<<<<<< .mine
#$self->emptyScratchCart;
#$self->session->scratch->delete('EMS_add_purchase_badgeId');
#$self->session->scratch->delete('EMS_add_purchase_events');
=======
unless ($self->session->scratch->get('EMS_add_purchase_badgeId')) {
$self->emptyScratchCart;
$self->session->scratch->delete('EMS_add_purchase_events');
}
>>>>>>> .r1600
push(@keys,$keywords) if $keywords; push(@keys,$keywords) if $keywords;
unless ($keywords =~ /^".*"$/) { unless ($keywords =~ /^".*"$/) {
foreach (split(" ",$keywords)) { foreach (split(" ",$keywords)) {