Skip to content

Commit 044544a

Browse files
committed
Disable empty values in RDF/POST parser again
Except for `su` which are relative subject URIs
1 parent 8acd5cf commit 044544a

3 files changed

Lines changed: 2 additions & 46 deletions

File tree

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/acl.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ exclude-result-prefixes="#all">
6262

6363
<xsl:template match="acl:mode[position() &gt; 1]" mode="bs2:FormControl" priority="2"/>
6464

65-
<xsl:template match="*[lacl:requestAccessTo/@rdf:resource]" priority="1">
65+
<xsl:template match="*[rdf:type/@rdf:resource = '&lacl;AuthorizationRequest']" priority="1">
6666
<xsl:param name="method" select="'post'" as="xs:string"/>
6767
<xsl:param name="action" select="ldh:href($ldt:base, resolve-uri(ac:uuid() || '/', resolve-uri('acl/authorizations/', $ldt:base)), map{ '_method': 'PUT' })" as="xs:anyURI"/> <!-- create new authorization document -->
6868
<xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ exclude-result-prefixes="#all"
160160
<xsl:choose>
161161
<xsl:when test="$inputs[1]/@name = 'rdf'">
162162
<xsl:variable name="value-inputs" select="subsequence($inputs, 2)[ixsl:contains(., 'value')]" as="element()*"/> <!-- skip the initial <input name="rdf"/> -->
163-
<xsl:variable name="value-inputs" select="$value-inputs[not(@name = 'ol' and ixsl:get(., 'value') = '')]" as="element()*"/> <!-- filter out empty literal values (empty 'su' values are valid: those are relative subject URIs) -->
163+
<xsl:variable name="value-inputs" select="$value-inputs[@name = 'su' or not(ixsl:get(., 'value') = '')]" as="element()*"/> <!-- filter out empty literal values (empty 'su' values are valid: those are relative subject URIs) -->
164164
<xsl:iterate select="$value-inputs">
165165
<xsl:param name="subj-input" select="if ($value-inputs[1]/@name = ('sb', 'su')) then $value-inputs[1] else ()" as="element()?"/>
166166
<xsl:param name="pred-input" as="element()?"/>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,48 +1182,4 @@ exclude-result-prefixes="#all"
11821182
</xsl:choose>
11831183
</xsl:template>
11841184

1185-
<!-- TO-DO: move to Web-Client -->
1186-
<xsl:template name="xhtml:Input">
1187-
<xsl:param name="type" as="xs:string"/>
1188-
<xsl:param name="id" as="xs:string?"/>
1189-
<xsl:param name="class" as="xs:string?"/>
1190-
<xsl:param name="name" as="xs:string?"/>
1191-
<xsl:param name="style" as="xs:string?"/>
1192-
<xsl:param name="disabled" as="xs:boolean?"/>
1193-
<xsl:param name="title" as="xs:string?"/>
1194-
<xsl:param name="value" as="xs:string?"/>
1195-
<xsl:param name="checked" as="xs:boolean?"/>
1196-
<xsl:param name="autocomplete" select="true()" as="xs:boolean?"/>
1197-
1198-
<input type="{$type}">
1199-
<xsl:if test="$id">
1200-
<xsl:attribute name="id" select="$id"/>
1201-
</xsl:if>
1202-
<xsl:if test="$class">
1203-
<xsl:attribute name="class" select="$class"/>
1204-
</xsl:if>
1205-
<xsl:if test="$name">
1206-
<xsl:attribute name="name" select="$name"/>
1207-
</xsl:if>
1208-
<xsl:if test="$style">
1209-
<xsl:attribute name="style" select="$style"/>
1210-
</xsl:if>
1211-
<xsl:if test="$disabled">
1212-
<xsl:attribute name="disabled" select="'disabled'"/>
1213-
</xsl:if>
1214-
<xsl:if test="$title">
1215-
<xsl:attribute name="title" select="$title"/>
1216-
</xsl:if>
1217-
<xsl:if test="exists($value)"> <!-- needs to allow empty strings -->
1218-
<xsl:attribute name="value" select="$value"/>
1219-
</xsl:if>
1220-
<xsl:if test="$checked">
1221-
<xsl:attribute name="checked" select="'checked'"/>
1222-
</xsl:if>
1223-
<xsl:if test="not($autocomplete)">
1224-
<xsl:attribute name="autocomplete" select="'off'"/>
1225-
</xsl:if>
1226-
</input>
1227-
</xsl:template>
1228-
12291185
</xsl:stylesheet>

0 commit comments

Comments
 (0)