Changeset 1045

Timestamp:

06/09/07 17:49:43 (18 months ago)

Author:

kake

Message:

Make sure that common categories and locales (if configured) show up on recent changes and create new page form (fixes #199).

Location:

trunk

Files:

• lib/OpenGuides.pm (modified) (1 diff)
• newpage.cgi (modified) (1 diff)
• t/58_recent_changes_navbar.t (added)

trunk/lib/OpenGuides.pm

@@ -629 +629 @@
     }
     $tt_vars{not_editable} = 1;
+    if ($config->enable_common_categories || $config->enable_common_locales) {
+        $tt_vars{common_catloc} = 1;
+        $tt_vars{common_categories} = $config->enable_common_categories;
+        $tt_vars{common_locales} = $config->enable_common_locales;
+        $tt_vars{catloc_link} = $config->script_url . $config->script_name
+                                . "?id=";
+    }
     $tt_vars{recent_changes} = \%recent_changes;
     my %processing_args = (

trunk/newpage.cgi

@@ -31 +31 @@
 
 sub show_form {
+    my %tt_vars = (
+                    not_editable     => 1,
+                    not_deletable    => 1,
+                    deter_robots     => 1,
+                    disallowed_chars => \@badchars,
+                    pagename         => $pagename,
+                  );
+    if ($config->enable_common_categories || $config->enable_common_locales) {
+        $tt_vars{common_catloc} = 1;
+        $tt_vars{common_categories} = $config->enable_common_categories;
+        $tt_vars{common_locales} = $config->enable_common_locales;
+        $tt_vars{catloc_link} = $config->script_url . $config->script_name
+                                . "?id=";
+    }
     print OpenGuides::Template->output( wiki     => $wiki,
                                         config   => $config,
                                         template => "newpage.tt",
-                                        vars     => {
-                                            not_editable     => 1,
-                                            not_deletable    => 1,
-                                            deter_robots     => 1,
-                                            disallowed_chars => \@badchars,
-                                            pagename         => $pagename }
+                                        vars     => \%tt_vars,
     );
 }