Merge pull request #2378 from MicrosoftDocs/master

taking changes to live

Author: KumarVivek

powerapps-docs/developer/model-driven-apps/clientapi/TOC.yml

@@ -168,6 +168,8 @@
         href: reference/controls/clearOptions.md
       - name: getAttribute
         href: reference/controls/getAttribute.md
+      - name: getContentWindow
+        href: reference/controls/getContentWindow.md
       - name: getControl
         href: reference/controls/getControl.md
       - name: getControlType

powerapps-docs/developer/model-driven-apps/clientapi/reference/Xrm-Utility/getGlobalContext/organizationSettings.md

@@ -1,13 +1,13 @@
 ---
 title: "getGlobalContext.organizationSettings (Client API reference) in model-driven apps| MicrosoftDocs"
-ms.date: 10/31/2018
+ms.date: 02/06/2020
 ms.service: powerapps
 ms.topic: "reference"
 applies_to: "Dynamics 365 (online)"
 ms.assetid: badf4f82-cb47-4864-aa43-bb777d04de4d
 author: "KumarVivek"
 ms.author: "kvivek"
-manager: "amyla"
+manager: "annbe"
 search.audienceType: 
   - developer
 search.app: 
@@ -42,6 +42,8 @@ Returns attributes and their values as `key:value` pairs that are available for
 
 Returns the ID of the base currency for the current organization.
 
+Deprecated; use [organizationSettings.baseCurrency](#basecurrency) instead to access the display name along with the ID of the base currency.
+
 ### Syntax
 
 `organizationSettings.baseCurrencyId`
@@ -50,7 +52,23 @@ Returns the ID of the base currency for the current organization.
 
 **Type**: String
 
-**Description**: ID of the base currency.
+**Description**: ID of the base currency. 
+
+## baseCurrency 
+
+Returns a lookup object containing the ID, name, and entity type of the base currency for the current organization.
+
+### Syntax
+
+`organizationSettings.baseCurrency`
+ 
+### Return Value
+
+**Type**: Lookup Object
+
+**Description**: Object containing the `id`, `name`, and `entityType` of the base currency. For example:
+
+`{id: "e7dd9bc6-d239-ea11-a813-000d3a35b14a", entityType: "transactioncurrency", name: "US Dollar"}`
 
 ## defaultCountryCode 
 

powerapps-docs/developer/model-driven-apps/clientapi/reference/Xrm-Utility/getGlobalContext/userSettings.md

@@ -1,6 +1,6 @@
 ---
 title: "getGlobalContext.userSettings (Client API reference) in model-driven apps| MicrosoftDocs"
-ms.date: 10/31/2018
+ms.date: 02/06/2020
 ms.service: powerapps
 ms.topic: "reference"
 applies_to: "Dynamics 365 (online)"
@@ -108,6 +108,20 @@ Returns the language ID for the current user.
 
 **Description**: Language ID.
 
+## roles 
+
+Returns a collection of lookup objects containing the GUID and display name of each of the security role or teams that the user is associated with.
+
+### Syntax
+
+`userSettings.roles`
+ 
+### Return Value
+
+**Type**: Array of objects
+
+**Description**: Object containing `id` and `name` of each of the security role or teams that the user is associated with.
+
 ## securityRolePrivileges 
 
 Returns an array of strings that represent the GUID values of each of the security role privilege that the user is associated with or any teams that the user is associated with.
@@ -124,7 +138,9 @@ Returns an array of strings that represent the GUID values of each of the securi
 
 ## securityRoles 
 
-Returns an array of strings that represent the GUID values of each of the security role that the user is associated with or any teams that the user is associated with.
+Returns an array of strings that represent the GUID values of each of the security role or teams that the user is associated with. 
+
+Deprecated; use [userSettings.roles](#roles) instead to view the display names of security roles or teams along with the ID.
 
 ### Syntax
 
@@ -138,10 +154,28 @@ Returns an array of strings that represent the GUID values of each of the securi
 
 `["0d3dd20a-17a6-e711-a94e-000d3a1a7a9b", "ff42d20a-17a6-e711-a94e-000d3a1a7a9b"]`
 
+## transactionCurrency 
+
+Returns a lookup object containing the ID, display name, and entity type of the transaction currency for the current user.
+
+### Syntax
+
+`userSettings.transactionCurrency`
+
+### Return Value
+
+**Type**: Lookup object
+
+**Description**: Object containing the `id`, `name`, and `entityType` of the transaction currency. For example:
+
+`{id: "e7dd9bc6-d239-ea11-a813-000d3a35b14a", entityType: "transactioncurrency", name: "US Dollar"}`
+
 ## transactionCurrencyId 
 
 Returns the transaction currency ID for the current user.
 
+Deprecated; use [userSettings.transactionCurrency](#transactioncurrency) instead to access the display name along with the ID.
+
 ### Syntax
 
 `userSettings.transactionCurrencyId`

powerapps-docs/developer/model-driven-apps/clientapi/reference/controls.md

@@ -75,24 +75,27 @@ These are the methods available for an IFRAME control.
 <tr>
 <td>
 <ul>
+<li><a href="controls/getContentWindow.md" data-raw-source="[getContentWindow](controls/getContentWindow.md)">getContentWindow</a></li>
 <li><a href="controls/getControlType.md" data-raw-source="[getControlType](controls/getControlType.md)">getControlType</a></li>
 <li><a href="controls/getDisabled.md" data-raw-source="[getDisabled](controls/getDisabled.md)">getDisabled</a></li>
 <li><a href="controls/getInitialUrl.md" data-raw-source="[getInitialUrl](controls/getInitialUrl.md)">getInitialUrl</a></li>
 <li><a href="controls/getLabel.md" data-raw-source="[getLabel](controls/getLabel.md)">getLabel</a></li>
-<li><a href="controls/getName.md" data-raw-source="[getName](controls/getName.md)">getName</a></li>
+
 </ul>
 </td>
 <td>
 <ul>
+<li><a href="controls/getName.md" data-raw-source="[getName](controls/getName.md)">getName</a></li>  
 <li><a href="controls/getObject.md" data-raw-source="[getObject](controls/getObject.md)">getObject</a></li>
 <li><a href="controls/getParent.md" data-raw-source="[getParent](controls/getParent.md)">getParent</a></li>
 <li><a href="controls/getSrc.md" data-raw-source="[getSrc](controls/getSrc.md)">getSrc</a></li>
 <li><a href="controls/getVisible.md" data-raw-source="[getVisible](controls/getVisible.md)">getVisible</a></li>
-<li><a href="controls/setDisabled.md" data-raw-source="[setDisabled](controls/setDisabled.md)">setDisabled</a></li>
+
 </ul>
 </td>
 <td>
 <ul>
+<li><a href="controls/setDisabled.md" data-raw-source="[setDisabled](controls/setDisabled.md)">setDisabled</a></li>
 <li><a href="controls/setFocus.md" data-raw-source="[setFocus](controls/setFocus.md)">setFocus</a></li>
 <li><a href="controls/setLabel.md" data-raw-source="[setLabel](controls/setLabel.md)">setLabel</a></li>
 <li><a href="controls/setSrc.md" data-raw-source="[setSrc](controls/setSrc.md)">setSrc</a></li>
@@ -281,6 +284,7 @@ These are the methods available for the timer control.
 <tr>
 <td>
 <ul>
+
 <li><a href="controls/getControlType.md" data-raw-source="[getControlType](controls/getControlType.md)">getControlType</a></li>
 <li><a href="controls/getDisabled.md" data-raw-source="[getDisabled](controls/getDisabled.md)">getDisabled</a></li>
 <li><a href="controls/getLabel.md" data-raw-source="[getLabel](controls/getLabel.md)">getLabel</a></li>

powerapps-docs/developer/model-driven-apps/clientapi/reference/controls/getContentWindow.md

@@ -0,0 +1,79 @@
+---
+title: "getContentWindow (Client API reference) in model-driven apps| MicrosoftDocs"
+ms.date: 02/06/2020
+ms.service: powerapps
+ms.topic: "reference"
+ms.assetid: ad68d177-3715-468e-b4af-8cf9b3c77799
+author: "KumarVivek"
+ms.author: "kvivek"
+manager: "annbe"
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+# getContentWindow (Client API reference)
+
+Returns the content window that represents an IFRAME or web resource.
+
+> [!NOTE]
+> This method is supported only on [Unified Interface](/powerapps/user/unified-interface).
+
+## Control types supported
+
+iframe, web resource
+
+## Syntax
+
+```JavaScript
+formContext.getControl(arg).getContenWindow().then(successCallback, errorCallback);
+```
+
+## Parameters
+
+|Name |Type|Required|Description|
+|---|---|---|---|
+|successCallback|Function|No|A function to call when operation is executed successfully. A content window instance representing the IFRAME or web resource is passed to the function.|
+|errorCallback|Function|No|A function to call when the operation fails.|
+
+
+## Return Value
+
+On success, returns a promise that contains a content window instance representing an IFRAME or web resource.
+
+## Example
+
+The following example shows how you can use this method with a HTML Web resource (new_myWebResource.htm).
+
+First, add the following code in your HTML web resource:
+
+```javascript
+// This script should be in the HTML web resource.
+// No usage of Xrm or formContext should happen until this method is called.
+function setClientApiContext(xrm, formContext) {
+    // Optionally set Xrm and formContext as global variables on the page.
+    window.Xrm = xrm;
+    window._formContext = formContext;
+     
+    // Add script logic here that uses xrm or the formContext.
+}
+```
+
+Next, add the following code in the form onLoad event handler:
+
+```javascript
+// This should be in a script loaded on the form. 
+// form_onload is a handler for the form onload event.
+function form_onload(executionContext) {
+    var formContext = executionContext.getFormContext();
+    var wrControl = formContext.getControl("new_myWebResource.htm");
+    if (wrControl) {
+        wrControl.getContentWindow().then(
+            function (contentWindow) {
+                contentWindow.setClientApiContext(Xrm, formContext);
+            }
+        )
+    }
+}
+```

powerapps-docs/maker/portals/create-portal.md

@@ -6,7 +6,7 @@ manager: kvivek
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 10/07/2019
+ms.date: 02/07/2020
 ms.author: tapanm
 ms.reviewer:
 ---
@@ -51,6 +51,9 @@ To create a portal:
 
 5.  In the **Portal from blank** window, enter a name for the portal and address for the website, and select a language from the drop-down list. When you're done, select **Create**.
 
+    > [!TIP]
+    > To create a portal using a different language, you must first [enable the language in the environment](https://docs.microsoft.com/power-platform/admin/enable-languages#enable-the-language) so that it becomes available in the language drop-down list.
+
     > [!div class=mx-imgBorder]
     > ![create new portal](media/create-new-portal.png "Create new portal")  
 
@@ -69,7 +72,7 @@ After the portal is provisioned successfully, the status is updated and the port
 To edit the portal in Power Apps portals Studio, see [Edit a portal](manage-existing-portals.md#edit).
 
 > [!NOTE]
-> - You can create a maximum of five portals in a tenant. However, there can only be one portal of each type created in an environment.
+> - There can be only one portal of each type and for a language created in an environment.
 > - If you don't have sufficient privileges to provision a portal, an error is displayed. You must have the System Administrator role in Common Data Service to create a portal. You must also have the **Access Mode** set to **Read-Write** under **Client Access License (CAL) Information** in the user record.
 > - If you have purchased an older portal add-on, and want to provision a portal using the add-on, you must go to the **Dynamics 365 Administration Center** page. More information: [Provision a portal using the older portal add-on](provision-portal-add-on.md)
 > - If you have provisioned a portal using the older portal add-on, you can still customize and manage it from [make.powerapps.com](https://make.powerapps.com).

powerapps-docs/user/grid-filters.md

@@ -45,33 +45,15 @@ You can also open primary field and lookup fields in a new tab or window.
 
    > [!div class="mx-imgBorder"]
    > ![Open in a new window](media/newtab.png "[Open in a new window")
-   
-   
-### Known issue
-
-If you change the default display format for number, currency, time, or date and then filter data on a grid, the filter will not show your selected display format. The filters will still display in the system default format and in some cases filtering may not work at all. 
-
-To fix the issue, set the display format for number, currency, time, and date back to the default setting. 
-
-1. In the upper-right corner, select the gear icon ![Gear icon](media/selection-rule-gear-button.png), and then select **Personalization Settings**.
-
-2. On the **Formats** tab change the number, currency, time, and date value back to the default setting.
-
-    > [!div class="mx-imgBorder"] 
-    > ![Format settings](media/default-format.png "format settings")
-    
-    
-  We are working on the issue, please check back for availability. 
-
-
+  
 
 ## Preview: New grid filters and search option
 
-This section is for early-access features. You can opt in early to enable these features in your environment. This will allow you to test these features and then adopt them across your environments. For information on how to enable these features, see [Opt in to 2020 release wave 1 updates](https://docs.microsoft.com/power-platform/admin/opt-in-early-access-updates).
+This section is for early-access features. You can opt in early to enable these features in your environment. This will allow you to test these features and then adopt them across your environments. For information about how to enable these features, see [Opt in to 2020 release wave 1 updates](https://docs.microsoft.com/power-platform/admin/opt-in-early-access-updates).
 
 
    > [!NOTE]
-   > Do not change the default display format for time, number, currency, time, or date as this causes an issue. For more information, see [Known issue](https://docs.microsoft.com/powerapps/user/grid-filters#known-issue).
+   > Don't change the default display format for time, number, currency, time, or date, because this causes an issue. For more information, see [Known issue](https://docs.microsoft.com/powerapps/user/grid-filters#known-issue).
 
 ### Lookup field column
 
@@ -89,28 +71,28 @@ The robust **Date** filter includes many different values to choose from, such a
 
 ### Filter the list of activities
 
-You can filter the list of activities to see only the ones you’re interested in. For example, you can further limit the activities you are seeing in a view by using the activity type filter. The activity type filter allows you to filter activities based on the type, such as email, task, phone call, and so on.
+You can filter the list of activities to see only the ones you're interested in. For example, you can further limit the activities you are seeing in a view by using the activity type filter. The activity type filter allows you to filter activities based on the type, such as email, task, phone call, and so on.
 
 
    > [!div class="mx-imgBorder"]
    > ![Activities filter](media/activity_filter.png "Activities filter")
 
 
-#### Known issue
+### Known issue
 
-If you change the default display format for number, currency, time, or date and then filter data on a grid, the filter will not show your selected display format. The filters will still display in the system default format and in some cases filtering may not work at all. 
+If you change the default display format for number, currency, time, or date and then filter data on a grid, the filter won't show your selected display format. The filters will still be displayed in the system default format, and in some cases filtering might not work at all. 
 
 To fix the issue, set the display format for number, currency, time, and date back to the default setting. 
 
 1. In the upper-right corner, select the gear icon ![Gear icon](media/selection-rule-gear-button.png), and then select **Personalization Settings**.
 
-2. On the **Formats** tab change the number, currency, time, and date value back to the default setting.
+2. On the **Formats** tab, change the number, currency, time, and date value back to the default setting.
 
     > [!div class="mx-imgBorder"] 
-    > ![Format settings](media/default-format.png "format settings")
+    > ![Format settings](media/default-format.png "Format settings")
     
-    
-We are working on the issue, please check back for availability. 
+We're working on this issue, please check back for information about the availability of a fix.
+
 
 ### Use search on a grid