Removed debug output

Passing `$id` and `$class` through admin-specific `bs2:RowForm` mode
AtomGraph · Oct 12, 2023 · 7a0d355 · 7a0d355
1 parent ebe2bff
commit 7a0d355
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl
@@ -119,38 +119,50 @@ exclude-result-prefixes="#all">
     <!-- ROW FORM - we need the overriding templates as well -->
 
     <xsl:template match="rdf:RDF[$ac:forClass = ('&ldh;CSVImport', '&ldh;RDFImport')][$ac:method = 'GET']" mode="bs2:RowForm" priority="2" use-when="system-property('xsl:product-name') = 'SAXON'">
+        <xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>
+        <xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
         <xsl:param name="action" select="ac:build-uri(resolve-uri('importer', $ldt:base), map{ 'forClass': string($ac:forClass), 'mode': '&ac;EditMode' })" as="xs:anyURI"/>
         <xsl:param name="classes" as="element()*"/>
 
         <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
             <xsl:with-param name="action" select="$action"/>
             <xsl:with-param name="classes" select="$classes"/>
         </xsl:next-match>
     </xsl:template>
 
     <xsl:template match="rdf:RDF[$ac:forClass][$ac:method = 'GET']" mode="bs2:RowForm" priority="1" use-when="system-property('xsl:product-name') = 'SAXON'">
+        <xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>
+        <xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
         <xsl:param name="action" select="ac:build-uri($a:graphStore, map{ 'forClass': string($ac:forClass), 'mode': '&ac;EditMode' })" as="xs:anyURI"/>
         <xsl:param name="classes" as="element()*"/>
-CCC
+
         <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
             <xsl:with-param name="action" select="$action"/>
             <xsl:with-param name="classes" select="$classes"/>
         </xsl:next-match>
     </xsl:template>
 
     <!-- add sp:Construct to the creatable class list below the form. Needs to pass parameters from signup.xsl and request-access.xsl!!! -->
-    <xsl:template match="rdf:RDF[base-uri()][$ac:method = 'GET']" mode="bs2:RowForm" use-when="system-property('xsl:product-name') = 'SAXON'">
+    <xsl:template match="rdf:RDF[$ac:method = 'GET']" mode="bs2:RowForm" use-when="system-property('xsl:product-name') = 'SAXON'">
+        <xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>
+        <xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
         <xsl:param name="action" select="ldh:href($ldt:base, ldh:absolute-path(base-uri()), map{}, ac:build-uri(ldh:absolute-path(base-uri()), map{ '_method': 'PUT', 'mode': for $mode in $ac:mode return string($mode) }))" as="xs:anyURI"/>
         <xsl:param name="enctype" select="'multipart/form-data'" as="xs:string?"/>
         <xsl:param name="create-resource" select="true()" as="xs:boolean"/>
         <!-- TO-DO: generate ontology classes from the OWL vocabulary -->
         <xsl:param name="ontology-classes" select="for $class-uri in ('&ldh;Constructor', '&owl;Class', '&owl;DatatypeProperty', '&owl;ObjectProperty', '&owl;Restriction') return key('resources', $class-uri, document(ac:document-uri($class-uri)))" as="element()*"/>
-BBB
+
         <xsl:next-match>
-            <xsl:with-param name="classes" select="$ontology-classes"/>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
             <xsl:with-param name="action" select="$action"/>
             <xsl:with-param name="enctype" select="$enctype"/>
             <xsl:with-param name="create-resource" select="$create-resource"/>
+            <xsl:with-param name="classes" select="$ontology-classes"/>
         </xsl:next-match>
     </xsl:template>
 

diff --git a/...in/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/request-access.xsl b/...in/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/request-access.xsl
@@ -84,8 +84,6 @@ exclude-result-prefixes="#all">
             </xsl:document>
         </xsl:variable>
 
-        $CONSTRUCTOR BASE URI: '<xsl:value-of select="base-uri($constructor)"/>'
-
         <xsl:apply-templates select="$constructor" mode="bs2:RowForm">
             <xsl:with-param name="id" select="'form-request-access'"/>
             <xsl:with-param name="action" select="ldh:absolute-path(base-uri($main-doc))"/>

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
@@ -768,7 +768,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="button-class" select="'btn btn-primary wymupdate'" as="xs:string?"/>
         <xsl:param name="create-resource" select="true()" as="xs:boolean"/>
         <xsl:param name="classes" as="element()*"/>
-AAA
+
         <form method="{$method}" action="{$action}">
             <xsl:if test="$id">
                 <xsl:attribute name="id" select="$id"/>