Changeset 1048

Timestamp:

11/28/08 18:05:15 (3 years ago)

Author:

CrawfordCurrie

Message:

Item175: fix web names for presentation in InstalledPlugins/Plugins

Location:

trunk/core/lib/Foswiki

Files:

• Plugin.pm (modified) (8 diffs)
• Plugins.pm (modified) (1 diff)

trunk/core/lib/Foswiki/Plugin.pm

@@ -115 +115 @@
 
     undef $this->{name};
-    undef $this->{installWeb};
+    undef $this->{topicWeb};
     undef $this->{module};
     undef $this->{errors};
@@ -129 +129 @@
     my ($this) = @_;
     my $p = $Foswiki::cfg{Plugins}{$this->{name}}{Module};
-    $this->{installWeb} = $Foswiki::cfg{SystemWebName};
 
     if (defined $p) {
@@ -150 +149 @@
     my $noTopic = eval '$' . $p . '::NO_PREFS_IN_TOPIC';
     $this->{no_topic} = $noTopic;
-    $this->{installWeb} = undef; # not known yet
-
-    # Find the plugin topic, if required
-    if ($noTopic) {
-        $this->{installWeb} = $Foswiki::cfg{SystemWebName};
-    } else  {
-        my $store = $this->{session}->{store};
-
-        foreach my $web (split(/[, ]+/,
-                               $Foswiki::cfg{Plugins}{WebSearchPath}),
-                         $this->{session}->{webName}) {
-            if ( $store->topicExists( $web, $this->{name} ) ) {
-                $this->{installWeb} = $web;
-                last;
-            }
-        }
-        if (!$this->{installWeb}) {
+    $this->{topicWeb} = undef; # not known yet
+
+    unless ($noTopic) {
+        if (!$this->topicWeb()) {
             # not found
             push(
@@ -175 +161 @@
             );
             $noTopic = 1;
-            $this->{installWeb} = $Foswiki::cfg{SystemWebName};
         }
     }
@@ -230 +215 @@
     my $prefs = $this->{session}->{prefs};
     if ( !$this->{no_topic} ) {
-        $prefs->pushPreferences( $this->{installWeb}, $this->{name}, 'PLUGIN',
+        $prefs->pushPreferences( $this->{topicWeb}, $this->{name}, 'PLUGIN',
             uc( $this->{name} ) . '_' );
     }
@@ -249 +234 @@
         $Foswiki::Plugins::SESSION->{webName},
         $users->getLoginName( $Foswiki::Plugins::SESSION->{user} ),
-        $this->{installWeb}
+        $this->{topicWeb}
     );
     use strict 'refs';
@@ -329 +314 @@
     $version = $release . ', ' . $version if $release;
 
-    my $result = ' ' . $this->{installWeb} . '.' . $this->{name} . ' ';
+    my $web = $this->topicWeb();
+    my $result = ' ' . ($web ? "$web." : '!') . $this->{name} . ' ';
     $result .=
       CGI::span( { class => 'twikiGrayText twikiSmall' },
@@ -337 +323 @@
 }
 
+=begin TML
+
+---++ ObjectMethod topicWeb() -> $webname
+
+Find the web that has the topic for this plugin by searching the
+{Plugins}{WebSearchPath}
+
+=cut
+
+sub topicWeb {
+    my $this = shift;
+
+    unless ( $this->{topicWeb}) {
+        # Find the plugin topic, if required
+        my $store = $this->{session}->{store};
+
+        foreach my $web (split(/[, ]+/,
+                               $Foswiki::cfg{Plugins}{WebSearchPath}),
+                         $this->{session}->{webName}) {
+            if ( $store->topicExists( $web, $this->{name} ) ) {
+                $this->{topicWeb} = $web;
+                last;
+            }
+        }
+    }
+    return $this->{topicWeb};
+}
+
 1;

trunk/core/lib/Foswiki/Plugins.pm

@@ -393 +393 @@
             $td = CGI::td('none');
         }
-die "BALLS $plugin->{name}" unless $plugin->{installWeb};
+        my $web = $plugin->topicWeb();
         $text .= CGI::Tr(
             { valign => 'top' },
             CGI::td(
-                ' ' . $plugin->{installWeb} . '.' . $plugin->{name} . ' '
+                ' ' . ($web ? "$web." : '!').$plugin->{name}.' '
               )
               . $td