diff --git a/packages/composer-playground/package.json b/packages/composer-playground/package.json index 146ca57510..c5161a1a78 100644 --- a/packages/composer-playground/package.json +++ b/packages/composer-playground/package.json @@ -126,7 +126,7 @@ "babel-loader": "^6.2.10", "babel-polyfill": "^6.23.0", "babel-preset-latest": "^6.24.1", - "basic-sample-network": "^0.1.0", + "basic-sample-network": "^0.1.2", "bootstrap": "4.0.0-alpha.5", "browserfs": "^1.1.0", "buffer-loader": "0.0.1", diff --git a/packages/composer-website/jekylldocs/_includes/head.html b/packages/composer-website/jekylldocs/_includes/head.html index 2b818a3c42..343f959f86 100644 --- a/packages/composer-website/jekylldocs/_includes/head.html +++ b/packages/composer-website/jekylldocs/_includes/head.html @@ -23,6 +23,6 @@ - + {% endif %} diff --git a/packages/composer-website/jekylldocs/business-network/query.md b/packages/composer-website/jekylldocs/business-network/query.md index e204939263..e49b014d03 100644 --- a/packages/composer-website/jekylldocs/business-network/query.md +++ b/packages/composer-website/jekylldocs/business-network/query.md @@ -20,7 +20,7 @@ Note: Queries are supported by the {{site.data.conrefs.hlf_full}} v1.0, embedded ## Types of Queries -{site.data.conrefs.composer}} supports two types of queries: named queries and dynamic queries. Named queries are specified in the business network definition and are exposed as GET methods by the composer-rest-server component. Dynamic queries may be constructed dynamically at runtime within a Transaction Processor function, or from client code. +{{site.data.conrefs.composer_full}} supports two types of queries: named queries and dynamic queries. Named queries are specified in the business network definition and are exposed as GET methods by the composer-rest-server component. Dynamic queries may be constructed dynamically at runtime within a Transaction Processor function, or from client code. ## Writing Named Queries @@ -47,9 +47,9 @@ The named query below is defined in terms of 3 parameters: ``` query Q18 { - description: "Select all drivers aged older than PARAM" - statement: - SELECT org.acme.Driver + description: "Select all drivers aged older than PARAM" + statement: + SELECT org.acme.Driver WHERE (_$ageParam < age) ORDER BY [lastName ASC, firstName DESC] LIMIT _$limitParam diff --git a/packages/composer-website/jekylldocs/reference/JSDOC-README.md b/packages/composer-website/jekylldocs/reference/JSDOC-README.md index e65aac4f41..0bd5a9e8b1 100644 --- a/packages/composer-website/jekylldocs/reference/JSDOC-README.md +++ b/packages/composer-website/jekylldocs/reference/JSDOC-README.md @@ -1,10 +1,11 @@ --- -index-order: 909 +layout: default title: API Documentation section: reference -layout: default exception: API -excerpt: The Client, Admin, and Runtime components of Hyperledger Composer contain [JavaScript APIs](../jsdoc/index.html) for application integration. +sidebar: sidebars/accordion-toc0.md +excerpt: The Client, Admin, and Runtime components of Hyperledger Composer contain [JavaScript APIs](../jsdoc/index.html) for application integration. +index-order: 909 --- # Hyperledger Composer API diff --git a/packages/composer-website/jekylldocs/support/index.md b/packages/composer-website/jekylldocs/support/support-index.md similarity index 100% rename from packages/composer-website/jekylldocs/support/index.md rename to packages/composer-website/jekylldocs/support/support-index.md diff --git a/packages/composer-website/jekylldocs/tutorials/playground-guide.md b/packages/composer-website/jekylldocs/tutorials/playground-guide.md index 35374738f6..60d89375b6 100644 --- a/packages/composer-website/jekylldocs/tutorials/playground-guide.md +++ b/packages/composer-website/jekylldocs/tutorials/playground-guide.md @@ -96,6 +96,14 @@ rule Default { resource: "org.acme.mynetwork.*" action: ALLOW } + +rule SystemACL { + description: "System ACL to permit all access" + participant: "org.hyperledger.composer.system.Participant" + operation: ALL + resource: "org.hyperledger.composer.system.**" + action: ALLOW +} ``` This access control simply allows all participants access to all resources.