Skip to content

Commit e1ede64

Browse files
namedgraphnamedgraph
committed
Removed ldh:DocumentLoaded named template
Tunneling `$action` params
1 parent 62e8ccf commit e1ede64

File tree

11 files changed

+87
-82
lines changed

11 files changed

+87
-82
lines changed

‎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
@@ -64,7 +64,7 @@ exclude-result-prefixes="#all">
6464

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

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ exclude-result-prefixes="#all">
103103
<xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>
104104
<xsl:param name="class" select="'row-fluid'" as="xs:string?"/>
105105
<xsl:param name="method" select="'patch'" as="xs:string"/>
106-
<xsl:param name="action" select="ldh:href(ac:build-uri(ac:absolute-path(ldh:base-uri(.)), map{ '_method': 'PUT' }))" as="xs:anyURI"/>
106+
<xsl:param name="action" select="ldh:href(ac:build-uri(ac:absolute-path(ldh:base-uri(.)), map{ '_method': 'PUT' }))" as="xs:anyURI" tunnel="yes"/>
107107
<xsl:param name="enctype" select="'multipart/form-data'" as="xs:string?"/>
108108
<xsl:param name="create-resource" select="true()" as="xs:boolean"/>
109109
<!-- TO-DO: generate ontology classes from the OWL vocabulary -->
@@ -114,7 +114,7 @@ exclude-result-prefixes="#all">
114114
<xsl:with-param name="id" select="$id"/>
115115
<xsl:with-param name="class" select="$class"/>
116116
<xsl:with-param name="method" select="$method"/>
117-
<xsl:with-param name="action" select="$action"/>
117+
<xsl:with-param name="action" select="$action" tunnel="yes"/>
118118
<xsl:with-param name="enctype" select="$enctype"/>
119119
<xsl:with-param name="create-resource" select="$create-resource"/>
120120
<xsl:with-param name="classes" select="$classes"/>

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ exclude-result-prefixes="#all">
7171
<xsl:apply-templates select="ldh:construct(map{ xs:anyURI('&foaf;Person'): $constructors//srx:result[srx:binding[@name = 'Type'] = '&foaf;Person']/srx:binding[@name = 'construct']/srx:literal/string() })" mode="bs2:RowForm">
7272
<xsl:with-param name="id" select="'form-signup'"/>
7373
<xsl:with-param name="method" select="'post'"/> <!-- don't use PATCH which is the default -->
74-
<xsl:with-param name="action" select="ac:absolute-path(base-uri($main-doc))"/>
74+
<xsl:with-param name="action" select="ac:absolute-path(base-uri($main-doc))" tunnel="yes"/>
7575
<xsl:with-param name="enctype" select="()"/> <!-- don't use 'multipart/form-data' which is the default -->
7676
<xsl:with-param name="create-resource" select="false()"/>
7777
<xsl:with-param name="base-uri" select="ac:absolute-path(base-uri($main-doc))" tunnel="yes"/> <!-- base-uri() is empty on constructed documents -->

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ exclude-result-prefixes="#all"
658658
<xsl:apply-templates select="$constructed-doc" mode="bs2:RowForm">
659659
<xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
660660
<xsl:with-param name="method" select="$method"/>
661-
<xsl:with-param name="action" select="ldh:href($doc-uri, map{})" as="xs:anyURI"/>
661+
<xsl:with-param name="action" select="ldh:href($doc-uri, map{})" as="xs:anyURI" tunnel="yes"/>
662662
<xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
663663
<xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
664664
<xsl:with-param name="constructor" select="$constructed-doc" tunnel="yes"/>

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ exclude-result-prefixes="#all"
511511

512512
<ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
513513

514-
<!-- abort the previous request, if any -->
514+
<!-- abort the previous request, if any
515515
<xsl:if test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub'), 'request')">
516516
<xsl:message>Aborting HTTP request that has already been sent</xsl:message>
517517
<xsl:sequence select="ixsl:call(ixsl:get(ixsl:window(), 'LinkedDataHub.request'), 'abort', [])"/>
@@ -525,8 +525,22 @@ exclude-result-prefixes="#all"
525525
</ixsl:schedule-action>
526526
</xsl:variable>
527527
528-
<!-- store the new request object -->
529-
<ixsl:set-property name="request" select="$request" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
528+
store the new request object
529+
<ixsl:set-property name="request" select="$request" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>-->
530+
531+
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': $href, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
532+
<xsl:variable name="context" select="
533+
map{
534+
'request': $request,
535+
'href': $href,
536+
'push-state': true()
537+
}" as="map(*)"/>
538+
<ixsl:promise select="
539+
ixsl:http-request($context('request'))
540+
=> ixsl:then(ldh:rethread-response($context, ?))
541+
=> ixsl:then(ldh:handle-response#1)
542+
=> ixsl:then(ldh:xhtml-document-loaded#1)
543+
" on-failure="ldh:promise-failure#1"/>
530544
</xsl:otherwise>
531545
</xsl:choose>
532546
</xsl:template>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ WHERE
518518
<xsl:apply-templates select="$document" mode="bs2:Form"> <!-- document level template -->
519519
<xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
520520
<xsl:with-param name="method" select="$method"/>
521-
<xsl:with-param name="action" select="$action"/>
521+
<xsl:with-param name="action" select="$action" tunnel="yes"/>
522522
<xsl:with-param name="form-actions-class" select="'form-actions modal-footer'"/>
523523
<xsl:with-param name="classes" select="()"/>
524524
<xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
@@ -1049,7 +1049,7 @@ WHERE
10491049
<xsl:apply-templates select="." mode="bs2:Form"> <!-- document level template -->
10501050
<xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
10511051
<xsl:with-param name="method" select="$form/@method"/>
1052-
<xsl:with-param name="action" select="$form/@action" as="xs:anyURI"/>
1052+
<xsl:with-param name="action" select="$form/@action" as="xs:anyURI" tunnel="yes"/>
10531053
<xsl:with-param name="form-actions-class" select="'form-actions modal-footer'" as="xs:string?"/>
10541054
<xsl:with-param name="classes" select="()"/>
10551055
<xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
@@ -1221,7 +1221,7 @@ WHERE
12211221
<xsl:apply-templates select="$constructed-doc" mode="bs2:Form"> <!-- document level template -->
12221222
<xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
12231223
<xsl:with-param name="method" select="'put'"/>
1224-
<xsl:with-param name="action" select="ldh:href($doc-uri, map{})" as="xs:anyURI"/>
1224+
<xsl:with-param name="action" select="ldh:href($doc-uri)" as="xs:anyURI" tunnel="yes"/>
12251225
<xsl:with-param name="form-actions-class" select="'form-actions modal-footer'" as="xs:string?"/>
12261226
<xsl:with-param name="classes" select="$classes"/>
12271227
<xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
@@ -1317,7 +1317,7 @@ WHERE
13171317
<xsl:apply-templates select="$constructed-doc" mode="bs2:RowForm">
13181318
<xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
13191319
<xsl:with-param name="method" select="$method"/>
1320-
<xsl:with-param name="action" select="ldh:href($doc-uri, map{})" as="xs:anyURI"/>
1320+
<xsl:with-param name="action" select="ldh:href($doc-uri)" as="xs:anyURI" tunnel="yes"/>
13211321
<xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
13221322
<xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
13231323
<xsl:with-param name="constructor" select="$constructed-doc" tunnel="yes"/>
@@ -1578,7 +1578,7 @@ WHERE
15781578

15791579
<xsl:apply-templates select="$resource" mode="bs2:Form">
15801580
<xsl:with-param name="method" select="'post'"/>
1581-
<xsl:with-param name="action" select="ldh:href($doc-uri, map{})" as="xs:anyURI"/>
1581+
<xsl:with-param name="action" select="ldh:href($doc-uri)" as="xs:anyURI" tunnel="yes"/>
15821582
<xsl:with-param name="classes" select="$classes"/>
15831583
<xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
15841584
<xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>

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

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -943,15 +943,29 @@ LIMIT 10
943943

944944
<xsl:choose>
945945
<xsl:when test="?status = (200, 204)">
946-
<!-- load document -->
946+
<!-- load document
947947
<xsl:variable name="request" as="item()*">
948948
<ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }">
949949
<xsl:call-template name="ldh:DocumentLoaded">
950950
<xsl:with-param name="href" select="ac:build-uri(ac:absolute-path($uri), map{ 'mode': '&ac;ReadMode'})"/>
951951
</xsl:call-template>
952952
</ixsl:schedule-action>
953953
</xsl:variable>
954-
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
954+
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>-->
955+
956+
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': $uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
957+
<xsl:variable name="context" select="
958+
map{
959+
'request': $request,
960+
'href': ac:build-uri(ac:absolute-path($uri), map{ 'mode': '&ac;ReadMode'}),
961+
'push-state': true()
962+
}" as="map(*)"/>
963+
<ixsl:promise select="
964+
ixsl:http-request($context('request'))
965+
=> ixsl:then(ldh:rethread-response($context, ?))
966+
=> ixsl:then(ldh:handle-response#1)
967+
=> ixsl:then(ldh:xhtml-document-loaded#1)
968+
" on-failure="ldh:promise-failure#1"/>
955969

956970
<!-- remove the modal div -->
957971
<xsl:sequence select="ixsl:call($form/ancestor::div[contains-token(@class, 'modal')], 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
@@ -985,16 +999,31 @@ LIMIT 10
985999
<xsl:variable name="control-group" select="$form/descendant::div[contains-token(@class, 'control-group')][input[@name = 'pu'][@value = '&sioc;has_parent']]" as="element()*"/>
9861000
<xsl:variable name="uri" select="$control-group/descendant::input[@name = 'ou']/ixsl:get(., 'value')" as="xs:anyURI"/>
9871001

988-
<!-- load document -->
1002+
<!-- load document
9891003
<xsl:variable name="request" as="item()*">
9901004
<ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }">
9911005
<xsl:call-template name="ldh:DocumentLoaded">
9921006
<xsl:with-param name="href" select="ac:absolute-path($uri)"/>
993-
<xsl:with-param name="refresh-content" select="true()"/> <!-- make sure content (e.g. containers) do not use a stale response -->
1007+
<xsl:with-param name="refresh-content" select="true()"/> make sure content (e.g. containers) do not use a stale response
9941008
</xsl:call-template>
9951009
</ixsl:schedule-action>
9961010
</xsl:variable>
997-
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
1011+
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>-->
1012+
1013+
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': $uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
1014+
<xsl:variable name="context" select="
1015+
map{
1016+
'request': $request,
1017+
'href': ac:absolute-path($uri),
1018+
'push-state': true(),
1019+
'refresh-content': true()
1020+
}" as="map(*)"/>
1021+
<ixsl:promise select="
1022+
ixsl:http-request($context('request'))
1023+
=> ixsl:then(ldh:rethread-response($context, ?))
1024+
=> ixsl:then(ldh:handle-response#1)
1025+
=> ixsl:then(ldh:xhtml-document-loaded#1)
1026+
" on-failure="ldh:promise-failure#1"/>
9981027

9991028
<!-- remove the modal div -->
10001029
<xsl:sequence select="ixsl:call($form/ancestor::div[contains-token(@class, 'modal')], 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
@@ -1015,14 +1044,29 @@ LIMIT 10
10151044
</xsl:when>
10161045
<!-- if the form submit did not originate from a typeahead (target), load the created resource -->
10171046
<xsl:otherwise>
1018-
<xsl:variable name="request" as="item()*">
1047+
<!-- <xsl:variable name="request" as="item()*">
10191048
<ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $created-uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }">
10201049
<xsl:call-template name="ldh:DocumentLoaded">
10211050
<xsl:with-param name="href" select="ac:absolute-path($created-uri)"/>
10221051
</xsl:call-template>
10231052
</ixsl:schedule-action>
10241053
</xsl:variable>
1025-
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
1054+
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>-->
1055+
1056+
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': $created-uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
1057+
<xsl:variable name="context" select="
1058+
map{
1059+
'request': $request,
1060+
'href': ac:absolute-path($created-uri),
1061+
'push-state': true(),
1062+
'refresh-content': true()
1063+
}" as="map(*)"/>
1064+
<ixsl:promise select="
1065+
ixsl:http-request($context('request'))
1066+
=> ixsl:then(ldh:rethread-response($context, ?))
1067+
=> ixsl:then(ldh:handle-response#1)
1068+
=> ixsl:then(ldh:xhtml-document-loaded#1)
1069+
" on-failure="ldh:promise-failure#1"/>
10261070
</xsl:otherwise>
10271071
</xsl:choose>
10281072
</xsl:when>

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ extension-element-prefixes="ixsl"
301301
<xsl:param name="method" select="'post'" as="xs:string"/>
302302
<xsl:param name="doc-type" select="xs:anyURI('&dh;Item')" as="xs:anyURI"/>
303303
<xsl:param name="type" select="xs:anyURI('&ldh;GraphChart')" as="xs:anyURI"/>
304-
<xsl:param name="action" select="ac:build-uri(resolve-uri('charts/', $ldt:base), map{ 'forClass': string($type) })" as="xs:anyURI"/>
304+
<xsl:param name="action" select="ac:build-uri(resolve-uri('charts/', $ldt:base), map{ 'forClass': string($type) })" as="xs:anyURI" tunnel="yes"/>
305305
<xsl:param name="id" as="xs:string?"/>
306306
<xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
307307
<xsl:param name="button-class" select="'btn'" as="xs:string?"/>
@@ -467,7 +467,7 @@ extension-element-prefixes="ixsl"
467467
<xsl:param name="method" select="'post'" as="xs:string"/>
468468
<xsl:param name="doc-type" select="xs:anyURI('&dh;Item')" as="xs:anyURI"/>
469469
<xsl:param name="type" select="xs:anyURI('&ldh;ResultSetChart')" as="xs:anyURI"/>
470-
<xsl:param name="action" select="ac:build-uri(resolve-uri('charts/', $ldt:base), map{ 'forClass': string($type) })" as="xs:anyURI"/>
470+
<xsl:param name="action" select="ac:build-uri(resolve-uri('charts/', $ldt:base), map{ 'forClass': string($type) })" as="xs:anyURI" tunnel="yes"/>
471471
<xsl:param name="id" as="xs:string?"/>
472472
<xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
473473
<xsl:param name="button-class" select="'btn'" as="xs:string?"/>
@@ -679,7 +679,7 @@ extension-element-prefixes="ixsl"
679679
<xsl:template match="rdf:RDF" mode="bs2:Form">
680680
<xsl:param name="method" select="'post'" as="xs:string"/>
681681
<xsl:param name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI" tunnel="yes"/>
682-
<xsl:param name="action" select="ldh:href(ac:absolute-path($base-uri))" as="xs:anyURI"/>
682+
<xsl:param name="action" select="ldh:href(ac:absolute-path($base-uri))" as="xs:anyURI" tunnel="yes"/>
683683
<xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>
684684
<xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
685685
<xsl:param name="form-actions-class" select="'form-actions'" as="xs:string?"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,9 @@ exclude-result-prefixes="#all"
572572
<xsl:param name="id" select="generate-id()" as="xs:string"/>
573573
<xsl:param name="class" select="'subject-slug input-xxlarge'" as="xs:string?"/>
574574
<xsl:param name="disabled" select="false()" as="xs:boolean"/>
575-
<xsl:param name="slug" select="ac:uuid()" as="xs:string"/>
575+
<xsl:param name="action" tunnel="yes"/>
576+
<!-- cut slug segment from form action URL -->
577+
<xsl:param name="slug" select="substring-before(substring-after($action, ac:absolute-path(ldh:base-uri(.))), '/')" as="xs:string"/>
576578

577579
<div class="control-group">
578580
<xsl:if test="$type = 'hidden'">
@@ -586,7 +588,7 @@ exclude-result-prefixes="#all"
586588
</span>
587589
<div class="controls">
588590
<span class="input-prepend input-append">
589-
<input type="hidden" name="su" value="{ac:absolute-path(ldh:base-uri(.)) || encode-for-uri($slug) || '/'}"/>
591+
<input type="hidden" name="su" value="{$action}"/>
590592

591593
<span class="add-on">
592594
<xsl:value-of select="ac:absolute-path(ldh:base-uri(.))"/>

0 commit comments

Comments
 (0)