From 06ee6e38450d7ec981929f4990d42d17f28a819d Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Wed, 6 Jun 2018 23:23:15 +0200
Subject: [PATCH] Add id and guid on datatype pages

---
 .../datatypes/datatype.edit.controller.js     |  5 ++-
 .../src/views/datatypes/edit.html             | 37 ++++++++++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
index 74d35201c2..ad15167d18 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
@@ -50,8 +50,9 @@ function DataTypeEditController($scope, $routeParams, $location, appState, navig
     $scope.preValues = [];
 
     if ($routeParams.create) {
-
+        
         $scope.page.loading = true;
+        $scope.showIdentifier = false;
 
         //we are creating so get an empty data type item
         dataTypeResource.getScaffold($routeParams.id)
@@ -77,6 +78,8 @@ function DataTypeEditController($scope, $routeParams, $location, appState, navig
 
         $scope.page.loading = true;
 
+        $scope.showIdentifier = true;
+
         //we are editing so get the content item from the server
         dataTypeResource.getById($routeParams.id)
             .then(function(data) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
index 686ac2ef57..39f6f72324 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
@@ -21,28 +21,31 @@
 
          <umb-editor-container class="form-horizontal">
 
-            <umb-property property="properties.selectedEditor">
-                <div>
-                    <select name="selectedEditor"
-                           ng-model="content.selectedEditor"
-                           required
-                           ng-options="e.alias as e.name for e in content.availableEditors"></select>
-                    <span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
-                </div>
+             <umb-control-group label="Id" ng-if="showIdentifier">
+                 <div>{{content.id}}</div>
+                 <small>{{content.key}}</small>
+             </umb-control-group>
 
-            </umb-property>
+             <umb-property property="properties.selectedEditor">
+                 <div>
+                     <select name="selectedEditor"
+                             ng-model="content.selectedEditor"
+                             required
+                             ng-options="e.alias as e.name for e in content.availableEditors"></select>
+                     <span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
+                 </div>
 
-            <umb-property property="properties.selectedEditorId">
-                <div>{{content.selectedEditor}}</div>
-            </umb-property>
+             </umb-property>
 
+             <umb-property property="properties.selectedEditorId">
+                 <div>{{content.selectedEditor}}</div>
+             </umb-property>
 
-            <umb-property
-                property="preValue"
-                ng-repeat="preValue in preValues">
+             <umb-property property="preValue"
+                           ng-repeat="preValue in preValues">
 
-                <umb-editor model="preValue" is-pre-value="true"></umb-editor>
-            </umb-property>
+                 <umb-editor model="preValue" is-pre-value="true"></umb-editor>
+             </umb-property>
 
          </umb-editor-container>