From 8e1f06676a53915f465a474f8900a65d3312a9ec Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 22 Mar 2006 03:09:04 +0000 Subject: [PATCH] bug fixes --- lib/WebGUI/Asset/Wobject/Matrix.pm | 6 +++--- lib/WebGUI/Inbox/Message.pm | 6 +++--- lib/WebGUI/Operation/Inbox.pm | 6 ++++-- lib/WebGUI/i18n/English/WebGUI.pm | 14 ++------------ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index 448618556..759bc25a0 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -663,7 +663,7 @@ sub www_editListingSave { } $data{maintainerId} = $self->session->form->process("maintainerId") if ($self->canEdit); $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}) { $data{approvalMessageId} = WebGUI::Inbox->new($self->session)->addMessage({ 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).")"); } $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 $forum = WebGUI::Asset::Wobject::Collaboration->new($self->session, $listing->{forumId}); $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("body") ne "") { my $u = WebGUI::User->new($self->session, $listing->{maintainerId}); diff --git a/lib/WebGUI/Inbox/Message.pm b/lib/WebGUI/Inbox/Message.pm index 8ffd416b9..1a4aa3908 100644 --- a/lib/WebGUI/Inbox/Message.pm +++ b/lib/WebGUI/Inbox/Message.pm @@ -92,7 +92,7 @@ sub create { $self->{_properties}{completedBy} = $session->user->userId; $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, { toUser=>$self->{_properties}{userId}, toGroup=>$self->{_properties}{groupId}, @@ -120,7 +120,7 @@ Deletes this message from the inbox. sub delete { 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); } @@ -200,7 +200,7 @@ sub new { my $class = shift; my $session = 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; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Operation/Inbox.pm b/lib/WebGUI/Operation/Inbox.pm index 17b35731a..9e275af57 100644 --- a/lib/WebGUI/Operation/Inbox.pm +++ b/lib/WebGUI/Operation/Inbox.pm @@ -56,11 +56,13 @@ sub www_viewInbox { my $session = shift; return $session->privilege->insufficient() unless ($session->user->isInGroup(2)); my $i18n = WebGUI::International->new($session); + my $vars = {}; + my @msg = (); $vars->{title} = $i18n->get(159); $vars->{'subject.label'} = $i18n->get(351); $vars->{'status.label'} = $i18n->get(553); $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) { my $hash; $hash->{'subject'} = ''.$message->get("subject").''; @@ -88,7 +90,7 @@ sub www_viewInboxMessage { return $session->privilege->insufficient() unless ($session->user->isInGroup(2)); my $i18n = WebGUI::International->new($session); $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) { $vars->{'subject'} = $data->{subject}; $vars->{'dateStamp'} =$session->datetime->epochToHuman($data->{dateStamp}); diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 276e32966..6dc812022 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -950,8 +950,8 @@ That particular example will help you get good ranking on search engines. }, '352' => { - message => q|Date Of Entry|, - lastUpdated => 1031514049 + message => q|Date|, + lastUpdated => 1142991266 }, '1006' => { @@ -1412,11 +1412,6 @@ The Groups page displays all groups that you are allowed to edit. The form on t lastUpdated => 1031514049 }, - '245' => { - message => q|Date|, - lastUpdated => 1031514049 - }, - '543' => { message => q|Add a new image group.|, lastUpdated => 1031514049 @@ -1957,11 +1952,6 @@ default WebGUI groups such as Admin or Content Manager.

|, lastUpdated => 1129431985 }, - '479' => { - message => q|Date|, - lastUpdated => 1031514049 - }, - '159' => { message => q|Inbox|, lastUpdated => 1031514049