*** empty log message ***

This commit is contained in:
Matthew Wilson 2005-08-13 17:57:10 +00:00
parent f05c5925d1
commit ac7f170b98
7 changed files with 47 additions and 26 deletions

View file

@ -352,6 +352,7 @@ sub getAssetAdderLinks {
my $type = shift || "assets";
my %links;
foreach my $class (@{$session{config}{$type}}) {
next unless $class;
my $load = "use ".$class;
eval ($load);
if ($@) {

View file

@ -166,29 +166,40 @@ sub www_editMetaDataField {
$fieldInfo = $self->getMetaDataFields($session{form}{fid});
}
my $fid = $session{form}{fid} || "new";
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
$f->hidden(
-name => "func",
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
$f->hidden(
-name => "func",
-value => "editMetaDataFieldSave"
);
$f->hidden(
-name => "fid",
);
$f->hidden(
-name => "fid",
-value => $fid
);
$f->readOnly(
-value=>$fid,
-label=>WebGUI::International::get('Field Id','Asset'),
);
$f->text("fieldName", WebGUI::International::get('Field name','Asset'), $fieldInfo->{fieldName});
$f->textarea("description", WebGUI::International::get(85,"Asset"), $fieldInfo->{description});
$f->fieldType(
-name=>"fieldType",
-label=>WebGUI::International::get(486,"Asset"),
-value=>$fieldInfo->{fieldType} || "text",
$f->readOnly(
-value=>$fid,
-label=>WebGUI::International::get('Field Id','Asset'),
);
$f->text(
-name=>"fieldName",
-label=>WebGUI::International::get('Field name','Asset'),
-value=>$fieldInfo->{fieldName}
);
$f->textarea(
-name=>"description",
-label=>WebGUI::International::get(85,"Asset"),
-value=>$fieldInfo->{description});
$f->fieldType(
-name=>"fieldType",
-label=>WebGUI::International::get(486,"Asset"),
-value=>$fieldInfo->{fieldType} || "text",
-types=> [ qw /text integer yesNo selectList radioList/ ]
);
$f->textarea("possibleValues",WebGUI::International::get(487,"Asset"),$fieldInfo->{possibleValues});
$f->submit();
);
$f->textarea(
-name=>"possibleValues",
-label=>WebGUI::International::get(487,"Asset"),
-value=>$fieldInfo->{possibleValues}
);
$f->submit();
$ac->setHelp("metadata edit property","Asset");
return $ac->render($f->print, WebGUI::International::get('Edit Metadata',"Asset"));
}

View file

@ -161,7 +161,7 @@ sub getNamespaceSize {
my $self = shift;
my $expiresModifier = shift || 0;
my $path = shift || $self->getNamespaceRoot;
my $filesRmaining;
my $filesRemaining = '0';
if (opendir(DIR,$path)) {
my @files = readdir(DIR);
foreach my $file (@files) {
@ -172,7 +172,7 @@ sub getNamespaceSize {
if ($expires < time()+$expiresModifier) {
rmtree($path);
} else {
my (@attributes) = stat($self->getPath($filename));
my (@attributes) = stat($path.'/'.$file);
$filesRemaining += $attributes[7];
}
} else {
@ -263,7 +263,7 @@ Returns statistic information about the caching system.
=cut
sub stats {
my $self = shift;
my $self = shift;
return $self->getNamespaceSize." bytes";
}

View file

@ -17,6 +17,7 @@ package WebGUI::Form::date;
use strict;
use base 'WebGUI::Form::text';
use WebGUI::DateTime;
use WebGUI::Form::text;
use WebGUI::International;
use WebGUI::Session;
use WebGUI::Style;
@ -123,7 +124,7 @@ Renders a date picker control.
sub toHtml {
my $self = shift;
my $self->{value} = WebGUI::DateTime::epochToSet($self->{value}) unless ($self->{noDate} && $self->{value} eq '');
$self->{value} = WebGUI::DateTime::epochToSet($self->{value}) unless ($self->{noDate} && $self->{value} eq '');
my $language = WebGUI::International::getLanguage($session{user}{language},"languageAbbreviation");
unless ($language) {
$language = WebGUI::International::getLanguage("English","languageAbbreviation");
@ -133,7 +134,7 @@ sub toHtml {
WebGUI::Style::setScript($session{config}{extrasURL}.'/calendar/calendar-setup.js',{ type=>'text/javascript' });
WebGUI::Style::setLink($session{config}{extrasURL}.'/calendar/calendar-win2k-1.css', { rel=>"stylesheet", type=>"text/css", media=>"all" });
my $mondayFirst = $session{user}{firstDayOfWeek} ? "true" : "false";
return $self->toHtml . '<script type="text/javascript">
return $self->WebGUI::Form::text::toHtml . '<script type="text/javascript">
Calendar.setup({
inputField : "'.$self->{id}.'",
ifFormat : "%Y-%m-%d",

View file

@ -23,7 +23,8 @@ use WebGUI::SQL;
#-------------------------------------------------------------------
sub www_killSession {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return www_viewActiveSessions() if $session{form}{sid} eq $session{var}{sessionId};
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::Session::end($session{form}{sid});
return www_viewActiveSessions();
}

View file

@ -53,7 +53,7 @@ sub www_viewStatistics {
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(349).':</td><td class="tableData">'.$version.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from asset where state='published'");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(147).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from asset where isPackage=1");
($data) = WebGUI::SQL->quickArray("select count(distinct assetId) from assetData where isPackage=1");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(794).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from template");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>';