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

bug fixes

Browse source
This commit is contained in:
JT Smith 2006-03-22 03:09:04 +00:00
parent 1efaec679a
commit 8e1f06676a
4 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -663,7 +663,7 @@ sub www_editListingSave {
} }
$data{maintainerId} = $self->session->form->process("maintainerId") if ($self->canEdit); $data{maintainerId} = $self->session->form->process("maintainerId") if ($self->canEdit);
$data{assetId} = $self->getId; $data{assetId} = $self->getId;
$self->session->form->process("listingId") = $self->session->db->setRow("Matrix_listing","listingId",\%data); my $listingId = $self->session->db->setRow("Matrix_listing","listingId",\%data);
if ($data{status} eq "pending" && !$listing->{approvalMessageId}) { if ($data{status} eq "pending" && !$listing->{approvalMessageId}) {
$data{approvalMessageId} = WebGUI::Inbox->new($self->session)->addMessage({ $data{approvalMessageId} = WebGUI::Inbox->new($self->session)->addMessage({
status=>'pending', status=>'pending',
@ -685,7 +685,7 @@ sub www_editListingSave {
".$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->form->process("listingId")).", ".$self->session->db->quote($id).", ".$self->session->db->quote($value).")"); ".$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->form->process("listingId")).", ".$self->session->db->quote($id).", ".$self->session->db->quote($value).")");
} }
$a->finish; $a->finish;
return $self->www_viewDetail; return $self->www_viewDetail($listingId);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1012,7 +1012,7 @@ sub www_viewDetail {
my $listing = $self->session->db->getRow("Matrix_listing","listingId",$listingId); my $listing = $self->session->db->getRow("Matrix_listing","listingId",$listingId);
my $forum = WebGUI::Asset::Wobject::Collaboration->new($self->session, $listing->{forumId}); my $forum = WebGUI::Asset::Wobject::Collaboration->new($self->session, $listing->{forumId});
$var{"discussion"} = $forum->view; $var{"discussion"} = $forum->view;
$var{'isLoggedIn'} = ($self->session->user->get("userId") ne "1"); $var{'isLoggedIn'} = ($self->session->user->userId ne "1");
if ($self->session->form->process("do") eq "sendEmail") { if ($self->session->form->process("do") eq "sendEmail") {
if ($self->session->form->process("body") ne "") { if ($self->session->form->process("body") ne "") {
my $u = WebGUI::User->new($self->session, $listing->{maintainerId}); my $u = WebGUI::User->new($self->session, $listing->{maintainerId});

6
lib/WebGUI/Inbox/Message.pm
View file

@ -92,7 +92,7 @@ sub create {
$self->{_properties}{completedBy} = $session->user->userId; $self->{_properties}{completedBy} = $session->user->userId;
$self->{_properties}{completedOn} = time(); $self->{_properties}{completedOn} = time();
} }
$self->{_messageId} = $self->{_properties}{messageId} = $session->setRow("inbox","messageId",$self->{_properties}); $self->{_messageId} = $self->{_properties}{messageId} = $session->db->setRow("inbox","messageId",$self->{_properties});
my $mail = WebGUI::Mail::Send->create($session, { my $mail = WebGUI::Mail::Send->create($session, {
toUser=>$self->{_properties}{userId}, toUser=>$self->{_properties}{userId},
toGroup=>$self->{_properties}{groupId}, toGroup=>$self->{_properties}{groupId},
@ -120,7 +120,7 @@ Deletes this message from the inbox.
sub delete { sub delete {
my $self = shift; my $self = shift;
my $sth = $self->session->db->prepare("delete from userInbox where messageId=?"); my $sth = $self->session->db->prepare("delete from inbox where messageId=?");
$sth->execute($self->getId); $sth->execute($self->getId);
} }
@ -200,7 +200,7 @@ sub new {
my $class = shift; my $class = shift;
my $session = shift; my $session = shift;
my $messageId = shift; my $messageId = shift;
bless {_properties=>$session->db->getRow("userInbox","messageId",$messageId), _session=>$session, _messageId=>$messageId}, $class; bless {_properties=>$session->db->getRow("inbox","messageId",$messageId), _session=>$session, _messageId=>$messageId}, $class;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

6
lib/WebGUI/Operation/Inbox.pm
View file

@ -56,11 +56,13 @@ sub www_viewInbox {
my $session = shift; my $session = shift;
return $session->privilege->insufficient() unless ($session->user->isInGroup(2)); return $session->privilege->insufficient() unless ($session->user->isInGroup(2));
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);
my $vars = {};
my @msg = ();
$vars->{title} = $i18n->get(159); $vars->{title} = $i18n->get(159);
$vars->{'subject.label'} = $i18n->get(351); $vars->{'subject.label'} = $i18n->get(351);
$vars->{'status.label'} = $i18n->get(553); $vars->{'status.label'} = $i18n->get(553);
$vars->{'dateStamp.label'} = $i18n->get(352); $vars->{'dateStamp.label'} = $i18n->get(352);
my $messages = WebGUI::Inbox->getMessagesForUser($session, $session->user); my $messages = WebGUI::Inbox->new($session)->getMessagesForUser($session->user);
foreach my $message (@$messages) { foreach my $message (@$messages) {
my $hash; my $hash;
$hash->{'subject'} = '<a href="'.$session->url->page('op=viewInboxMessage;messageId='.$message->getId).'">'.$message->get("subject").'</a>'; $hash->{'subject'} = '<a href="'.$session->url->page('op=viewInboxMessage;messageId='.$message->getId).'">'.$message->get("subject").'</a>';
@ -88,7 +90,7 @@ sub www_viewInboxMessage {
return $session->privilege->insufficient() unless ($session->user->isInGroup(2)); return $session->privilege->insufficient() unless ($session->user->isInGroup(2));
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);
$vars->{title} = $i18n->get(159); $vars->{title} = $i18n->get(159);
my $message = WebGUI::Inbox->getMessage($session, $session->form->param("messageId")); my $message = WebGUI::Inbox->new($session)->getMessage($session->form->param("messageId"));
if (defined $message) { if (defined $message) {
$vars->{'subject'} = $data->{subject}; $vars->{'subject'} = $data->{subject};
$vars->{'dateStamp'} =$session->datetime->epochToHuman($data->{dateStamp}); $vars->{'dateStamp'} =$session->datetime->epochToHuman($data->{dateStamp});

14
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -950,8 +950,8 @@ That particular example will help you get good ranking on search engines.
}, },
'352' => { '352' => {
message => q|Date Of Entry|, message => q|Date|,
lastUpdated => 1031514049 lastUpdated => 1142991266
}, },
'1006' => { '1006' => {
@ -1412,11 +1412,6 @@ The Groups page displays all groups that you are allowed to edit. The form on t
lastUpdated => 1031514049 lastUpdated => 1031514049
}, },
'245' => {
message => q|Date|,
lastUpdated => 1031514049
},
'543' => { '543' => {
message => q|Add a new image group.|, message => q|Add a new image group.|,
lastUpdated => 1031514049 lastUpdated => 1031514049
@ -1957,11 +1952,6 @@ default WebGUI groups such as Admin or Content Manager.</p> |,
lastUpdated => 1129431985 lastUpdated => 1129431985
}, },
'479' => {
message => q|Date|,
lastUpdated => 1031514049
},
'159' => { '159' => {
message => q|Inbox|, message => q|Inbox|,
lastUpdated => 1031514049 lastUpdated => 1031514049