1 files changed, 37 insertions, 25 deletions

diff --git a/mod/mod-build-configs.cxx b/mod/mod-build-configs.cxx
index 126c1d8..9282544 100644
--- a/mod/mod-build-configs.cxx
+++ b/mod/mod-build-configs.cxx
@@ -3,8 +3,6 @@
 
 #include <mod/mod-build-configs.hxx>
 
-#include <algorithm> // replace()
-
 #include <libstudxml/serializer.hxx>
 
 #include <web/server/module.hxx>
@@ -15,7 +13,6 @@
 #include <mod/module-options.hxx>
 
 using namespace std;
-using namespace bbot;
 using namespace brep::cli;
 
 // While currently the user-defined copy constructor is not required (we don't
@@ -40,6 +37,9 @@ init (scanner& s)
 
   if (options_->build_config_specified ())
     build_config_module::init (*options_);
+
+  if (options_->root ().empty ())
+    options_->root (dir_path ("/"));
 }
 
 bool brep::build_configs::
@@ -49,7 +49,7 @@ handle (request& rq, response& rs)
 
   HANDLER_DIAG;
 
-  if (build_conf_ == nullptr)
+  if (target_conf_ == nullptr)
     throw invalid_request (501, "not implemented");
 
   const size_t page_configs (options_->build_config_page_entries ());
@@ -57,6 +57,8 @@ handle (request& rq, response& rs)
 
   params::build_configs params;
 
+  string& selected_class (params.class_name ()); // Note: can be empty.
+
   try
   {
     name_value_scanner s (rq.parameters (1024));
@@ -67,8 +69,7 @@ handle (request& rq, response& rs)
     // character (that is otherwise forbidden in a class name) to the plus
     // character.
     //
-    string& cn (params.class_name ());
-    replace (cn.begin (), cn.end (), ' ', '+');
+    replace (selected_class.begin (), selected_class.end (), ' ', '+');
   }
   catch (const cli::exception& e)
   {
@@ -93,7 +94,7 @@ handle (request& rq, response& rs)
   {
     string r (tenant_dir (root, tenant).string () + "?build-configs");
 
-    if (cls != "all")
+    if (!cls.empty ())
     {
       r += '=';
 
@@ -120,34 +121,44 @@ handle (request& rq, response& rs)
   //
   if (params.page () == 0)
   {
-    const strings& cls (build_conf_->classes);
-    const map<string, string>& im (build_conf_->class_inheritance_map);
+    const strings& cls (target_conf_->classes);
+    const map<string, string>& im (target_conf_->class_inheritance_map);
 
     s << DIV(ID="filter-heading") << "Build Configuration Classes" << ~DIV
       << P(ID="filter");
 
     for (auto b (cls.begin ()), i (b), e (cls.end ()); i != e; ++i)
     {
-      if (i != b)
-        s << ' ';
-
+      // Skip the 'hidden' class.
+      //
       const string& c (*i);
-      print_class_name (c, c == params.class_name ());
 
-      // Append the base class, if present.
-      //
-      auto j (im.find (c));
-      if (j != im.end ())
+      if (c != "hidden")
       {
-        s << ':';
-        print_class_name (j->second);
+        // Note that here we rely on the fact that the first class in the list
+        // can never be 'hidden' (is always 'all').
+        //
+        if (i != b)
+          s << ' ';
+
+        print_class_name (c, c == selected_class);
+
+        // Append the base class, if present.
+        //
+        auto j (im.find (c));
+        if (j != im.end ())
+        {
+          s << ':';
+          print_class_name (j->second);
+        }
       }
     }
 
     s << ~P;
   }
 
-  // Print build configurations that belong to the selected class.
+  // Print build configurations that belong to the selected class (all
+  // configurations if no class is selected) and are not hidden.
   //
   // We will calculate the total configuration count and cache configurations
   // for printing (skipping an appropriate number of them for page number
@@ -155,14 +166,15 @@ handle (request& rq, response& rs)
   // before printing the configurations.
   //
   size_t count (0);
-  vector<const build_config*> configs;
+  vector<const build_target_config*> configs;
   configs.reserve (page_configs);
 
   size_t skip (page * page_configs);
   size_t print (page_configs);
-  for (const build_config& c: *build_conf_)
+  for (const build_target_config& c: *target_conf_)
   {
-    if (belongs (c, params.class_name ()))
+    if ((selected_class.empty () || belongs (c, selected_class)) &&
+        !belongs (c, "hidden"))
     {
       if (skip != 0)
         --skip;
@@ -185,7 +197,7 @@ handle (request& rq, response& rs)
   // Enclose the subsequent tables to be able to use nth-child CSS selector.
   //
   s << DIV;
-  for (const build_config* c: configs)
+  for (const build_target_config* c: configs)
   {
     s << TABLE(CLASS="proplist config")
       <<   TBODY
@@ -217,7 +229,7 @@ handle (request& rq, response& rs)
                         count,
                         page_configs,
                         options_->build_config_pages (),
-                        url (params.class_name ()))
+                        url (selected_class))
     <<     ~DIV
     <<   ~BODY
     << ~HTML;