nitweb: update ModelView

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/web/api_catalog.nit b/src/web/api_catalog.nit
index 4d4eac9..42391c0 100644 (file)
--- a/src/web/api_catalog.nit
+++ b/src/web/api_catalog.nit
@@ -213,9 +213,9 @@ redef class APIEntity
 
                # Special case for packages (catalog view)
                if mentity isa MPackage then
-                       res.raw_json mentity.to_full_catalog_json(plain=true, config.catalog)
+                       res.raw_json mentity.to_full_catalog_json(plain=true, config.mainmodule, config.catalog)
                else
-                       res.raw_json mentity.to_full_json
+                       res.raw_json mentity.to_full_json(config.mainmodule)
                end
        end
 end
@@ -372,9 +372,9 @@ redef class MPackage
        # Serialize the full catalog version of `self` to JSON
        #
        # See: `FullCatalogSerializer`
-       fun to_full_catalog_json(catalog: Catalog, plain, pretty: nullable Bool): String do
+       fun to_full_catalog_json(mainmodule: MModule, catalog: Catalog, plain, pretty: nullable Bool): String do
                var stream = new StringWriter
-               var serializer = new FullCatalogSerializer(stream, catalog)
+               var serializer = new FullCatalogSerializer(stream, mainmodule, catalog)
                serializer.plain_json = plain or else false
                serializer.pretty_json = pretty or else false
                serializer.serialize self

diff --git a/src/web/api_metrics.nit b/src/web/api_metrics.nit
index 03518e4..21f84b4 100644 (file)
--- a/src/web/api_metrics.nit
+++ b/src/web/api_metrics.nit
@@ -28,41 +28,39 @@ class APIStructuralMetrics
        super APIHandler
 
        private fun mclasses_metrics: MetricSet do
-               var mainmodule = config.mainmodule
                var metrics = new MetricSet
-               metrics.register(new CNOA(mainmodule, config.view))
-               metrics.register(new CNOP(mainmodule, config.view))
-               metrics.register(new CNOC(mainmodule, config.view))
-               metrics.register(new CNOD(mainmodule, config.view))
-               metrics.register(new CNOAC(mainmodule, config.view))
-               metrics.register(new CNOAA(mainmodule, config.view))
-               metrics.register(new CNOAI(mainmodule, config.view))
-               metrics.register(new CDIT(mainmodule, config.view))
-               metrics.register(new CNBP(mainmodule, config.view))
-               metrics.register(new CNBA(mainmodule, config.view))
-               metrics.register(new CNBM(mainmodule, config.view))
-               metrics.register(new CNBI(mainmodule, config.view))
-               metrics.register(new CNBV(mainmodule, config.view))
-               metrics.register(new CNBIP(mainmodule, config.view))
-               metrics.register(new CNBRP(mainmodule, config.view))
-               metrics.register(new CNBHP(mainmodule, config.view))
-               metrics.register(new CNBLP(mainmodule, config.view))
+               metrics.register(new CNOA(config.view))
+               metrics.register(new CNOP(config.view))
+               metrics.register(new CNOC(config.view))
+               metrics.register(new CNOD(config.view))
+               metrics.register(new CNOAC(config.view))
+               metrics.register(new CNOAA(config.view))
+               metrics.register(new CNOAI(config.view))
+               metrics.register(new CDIT(config.view))
+               metrics.register(new CNBP(config.view))
+               metrics.register(new CNBA(config.view))
+               metrics.register(new CNBM(config.view))
+               metrics.register(new CNBI(config.view))
+               metrics.register(new CNBV(config.view))
+               metrics.register(new CNBIP(config.view))
+               metrics.register(new CNBRP(config.view))
+               metrics.register(new CNBHP(config.view))
+               metrics.register(new CNBLP(config.view))
                return metrics
        end
 
        private fun mmodules_metrics: MetricSet do
-               var mainmodule = config.mainmodule
                var metrics = new MetricSet
-               metrics.register(new MNOA(mainmodule, config.view))
-               metrics.register(new MNOP(mainmodule, config.view))
-               metrics.register(new MNOC(mainmodule, config.view))
-               metrics.register(new MNOD(mainmodule, config.view))
-               metrics.register(new MDIT(mainmodule, config.view))
-               metrics.register(new MNBD(mainmodule, config.view))
-               metrics.register(new MNBI(mainmodule, config.view))
-               metrics.register(new MNBR(mainmodule, config.view))
-               metrics.register(new MNBCC(mainmodule, config.view))
-               metrics.register(new MNBAC(mainmodule, config.view))
+               metrics.register(new MNOA(config.view))
+               metrics.register(new MNOP(config.view))
+               metrics.register(new MNOC(config.view))
+               metrics.register(new MNOD(config.view))
+               metrics.register(new MDIT(config.view))
+               metrics.register(new MNBD(config.view))
+               metrics.register(new MNBI(config.view))
+               metrics.register(new MNBR(config.view))
+               metrics.register(new MNBCC(config.view))
+               metrics.register(new MNBAC(config.view))
                return metrics
        end
 

diff --git a/src/web/web_base.nit b/src/web/web_base.nit
index ac63f53..7e6250e 100644 (file)
--- a/src/web/web_base.nit
+++ b/src/web/web_base.nit
@@ -42,7 +42,7 @@ class NitwebConfig
        #
        # So we can cache the model view.
        var view: ModelView is lazy do
-               var view = new ModelView(model)
+               var view = new ModelView(model, mainmodule)
                view.min_visibility = private_visibility
                view.include_fictive = true
                view.include_empty_doc = true