Merge pull request #543 from Esri/develop

sync dev with master AGOL R01 release
Esri · Mar 14, 2023 · 9163808 · 9163808
2 parents 5033426 + 6d7f3f4
commit 9163808
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/index.html b/index.html
@@ -41,8 +41,8 @@
     <!-- Bootstrap TouchSpinner CSS -->
     <link rel="stylesheet" type="text/css" href="js/vendor/touch-spinner/jquery.bootstrap-touchspin.min.css" />
     <!--Dojo and Esri CSS-->
-    <link rel="stylesheet" href="https://js.arcgis.com/3.42/dijit/themes/claro/claro.css" />
-    <link rel="stylesheet" href="https://js.arcgis.com/3.42/esri/css/esri.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.43/dijit/themes/claro/claro.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.43/esri/css/esri.css" />
     <!-- Load any application specific styles -->
     <link rel="stylesheet" href="css/main.css" type="text/css" />
     <link rel="stylesheet" href="css/common.css" type="text/css" />
@@ -113,7 +113,7 @@
     <script type="text/javascript" src="js/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"></script>
     <script type="text/javascript" src="js/vendor/touch-spinner/jquery.bootstrap-touchspin.min.js"></script>
     <script type="text/javascript" src="js/vendor/exif/exif.js"></script>
-    <script type="text/javascript" src="https://js.arcgis.com/3.42"></script>
+    <script type="text/javascript" src="https://js.arcgis.com/3.43"></script>
     <script type="text/javascript">
         require([
                 "application/bootstrapper"

diff --git a/js/main.js b/js/main.js
@@ -2249,7 +2249,7 @@ define([
                         return item;
                     }
                 });
-                if (this.selectedLayer._getSymbol(itemFromLayer)) {
+                if (itemFromLayer && this.selectedLayer._getSymbol(itemFromLayer)) {
                     symbolShape = itemFromLayer.getShape();
                     if (symbolShape && symbolShape.shape) {
                         if (symbolShape.shape.hasOwnProperty("r")) {
@@ -2969,7 +2969,8 @@ define([
                         newGraphic.attributes = result.features[i].attributes;
                         //Loop the attributes and replace empty values with configurable text
                         for (fields in newGraphic.attributes) {
-                            if (newGraphic.attributes.hasOwnProperty(fields)) {
+                            var fieldInfo = featureLayer.getField(fields);
+                            if (newGraphic.attributes.hasOwnProperty(fields) && fieldInfo && fieldInfo.type === 'esriFieldTypeString') {
                                 if (newGraphic.attributes[fields] === null || newGraphic.attributes[fields] === "") {
                                     newGraphic.attributes[fields] = this.config.showNullValueAs;
                                 }

diff --git a/js/nls/bg/resources.js b/js/nls/bg/resources.js
@@ -45,13 +45,13 @@ define({
   "signin": {
     "guestSigninText": "Продължете като Гост",
     "signInOrText": "Или",
-    "signinOptionsText": "Регистрация с:",
+    "signinOptionsText": "Вписване чрез:",
     "noGroupNameText": "Моля, влезте",
-    "guestLoginTooltip": "Регистрация като гост",
-    "facebookLoginTooltip": "Регистрация с Facebook",
-    "twitterLoginTooltip": "Регистрация с Twitter",
-    "googlePlusLoginTooltip": "Регистрация с Google+",
-    "agolLoginTooltip": "Регистрация с ArcGIS"
+    "guestLoginTooltip": "Вписване като гост",
+    "facebookLoginTooltip": "Вписване чрез Facebook",
+    "twitterLoginTooltip": "Вписване чрез Twitter",
+    "googlePlusLoginTooltip": "Вписване чрез Google+",
+    "agolLoginTooltip": "Вписване чрез ArcGIS"
   },
   "webMapList": {
     "owner": "Собственик",
@@ -77,7 +77,7 @@ define({
   "appHeader": {
     "help": "Помощ",
     "myReport": "Моите подавания",
-    "signIn": "Регистрация",
+    "signIn": "Вписване",
     "signOut": "Отписване",
     "signInTooltip": "Вписване",
     "signOutTooltip": "Отписване",