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

Merge commit '4635b91554' into WebGUI8. Syntax clean up to 7.10.2

Browse source
This commit is contained in:
Colin Kuskie 2010-10-27 15:59:33 -07:00
commit 87326192a3
46 changed files with 956 additions and 969 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2023,7 +2023,7 @@ sub www_importEvents {
-label => $i18n->get('ignore first line'),
-name => 'ignore_first_line',
-hoverHelp => $i18n->get('import hoverhelp first line'),
-defaultValue => $form->param('ignore_first_line'),
-defaultValue => scalar $form->param('ignore_first_line'),
);
# create the std & meta fields part of the form
@ -2040,7 +2040,7 @@ sub www_importEvents {
name => 'fieldsToImport',
defaultValue => \@defaultImportableFields,
options => \%importableFields,
value => $form->get('fieldsToImport'),
value => scalar $form->get('fieldsToImport'),
);
$f->submit(-value=>$i18n->get('import events'));

2
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -2610,7 +2610,7 @@ sub www_editThingDataSaveViaAjax {
return '{}';
}
else {
warn "thingId not found in thingProperties\n";
$session->log->warn("thingId ".$thingProperties->{thingId}." not found in thingProperties");
$session->http->setStatus(404);
return JSON->new->encode({message => "The thingId you requested can not be found."});
}

3
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -196,6 +196,7 @@ use WebGUI::International;
use HTML::Parser;
use URI::Escape;
use WebGUI::Form;
use WebGUI::Search;
use Clone qw/clone/;
#-------------------------------------------------------------------
@ -993,7 +994,7 @@ sub www_search {
mostPopularUrl=>$self->getUrl("func=mostPopular"),
mostPopularLabel=>$i18n->get("mostPopularLabel"),
wikiHomeUrl=>$self->getUrl,
addPageUrl=>$self->getUrl("func=add;class=WebGUI::Asset::WikiPage;title=".$queryString),
addPageUrl=>$self->getUrl("func=add;class=WebGUI::Asset::WikiPage;title=".$self->session->url->escape($queryString)),
};
$self->appendSearchBoxVars($var, $queryString);
if (length $queryString) {