cvs commit: p5ee/P5EEx/Blue/P5EEx/Blue Context.pm

[spadkins]

cvsuser     02/04/05 13:58:56

  Modified:    P5EEx/Blue/P5EEx/Blue Context.pm
  Log:
  fixed logic on widget_exists() method to take into account widgetType
  
  Revision  Changes    Path
  1.24      +29 -7     p5ee/P5EEx/Blue/P5EEx/Blue/Context.pm
  
  Index: Context.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Context.pm,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -w -r1.23 -r1.24
  --- Context.pm        22 Mar 2002 23:15:46 -0000      1.23
  +++ Context.pm        5 Apr 2002 21:58:56 -0000       1.24
  @@ -1,6 +1,6 @@
   
   #############################################################################
  -## $Id: Context.pm,v 1.23 2002/03/22 23:15:46 spadkins Exp $
  +## $Id: Context.pm,v 1.24 2002/04/05 21:58:56 spadkins Exp $
   #############################################################################
   
   package P5EEx::Blue::Context;
  @@ -625,9 +625,31 @@
   
   sub widget_exists {
       my ($self, $widget_name) = @_;
  -    return (defined $self->{session}{cache}{Widget}{$widget_name}{widgetClass} ||
  -            defined $self->{session}{state}{Widget}{$widget_name}{widgetClass} ||
  -            defined $self->{config}{Widget}{$widget_name}{widgetClass});
  +    my ($exists, $widget_type, $widget_class);
  +
  +    $widget_class =
  +        $self->{session}{cache}{Widget}{$widget_name}{widgetClass} ||
  +        $self->{session}{state}{Widget}{$widget_name}{widgetClass} ||
  +        $self->{config}{Widget}{$widget_name}{widgetClass};
  +
  +    if (!$widget_class) {
  +
  +        $widget_type =
  +            $self->{session}{cache}{Widget}{$widget_name}{widgetType} ||
  +            $self->{session}{state}{Widget}{$widget_name}{widgetType} ||
  +            $self->{config}{Widget}{$widget_name}{widgetType};
  +
  +        if ($widget_type) {
  +            $widget_class = $self->{config}{WidgetType}{$widget_type}{widgetClass};
  +        }
  +    }
  +
  +    $exists = $widget_class ? 1 : 0;
  +
  +    $self->dbgprint("Context->widget_exists($widget_name) = $exists")
  +        if ($P5EEx::Blue::DEBUG && $self->dbg(2));
  +
  +    return $exists;
   }
   
   #############################################################################
  @@ -885,8 +907,8 @@
   
   =head2 add_message()
   
  -The add_message() method writes a string (the concatenated list of @args) to
  -the default use channel.
  +The add_message() method stores a string (the concatenated list of @args) in
  +the Context until it can be viewed by and acted upon by the user.
   
       * Signature: $context->add_message($msg);
       * Param:  $msg         string  [in]
  @@ -903,7 +925,7 @@
   sub add_message {
       my ($self, $msg) = @_;
       if (defined $self->{messages}) {
  -        $self->{messages} .= "<br>" . $msg;
  +        $self->{messages} .= "<br>\n" . $msg;
       }
       else {
           $self->{messages} = $msg;