Merge pull request #4784 from enonic/issue-4745

Page Template Wizard- button 'Edit' in the support-selected option do…
enonic · Apr 6, 2017 · 48475d8 · 48475d8
2 parents 69b3980 + 617da7a
commit 48475d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...min/admin-ui/src/main/resources/web/admin/common/js/schema/content/ContentTypeComboBox.ts b/...min/admin-ui/src/main/resources/web/admin/common/js/schema/content/ContentTypeComboBox.ts
@@ -48,5 +48,9 @@ module api.schema.content {
             return content.getName();
         }
 
+        protected isEditButtonNeeded(): boolean {
+            return false;
+        }
+
     }
 }
diff --git a/...-ui/src/main/resources/web/admin/common/js/ui/selector/combobox/RichSelectedOptionView.ts b/...-ui/src/main/resources/web/admin/common/js/ui/selector/combobox/RichSelectedOptionView.ts
@@ -41,7 +41,7 @@ module api.ui.selector.combobox {
             if (this.draggable) {
                 buttons.push(new api.dom.DivEl('drag-control'));
             }
-            if (this.isEditable()) {
+            if (this.isEditButtonNeeded()) {
                 buttons.push(this.createEditButton(content));
             }
             if (this.removable) {
@@ -50,6 +50,10 @@ module api.ui.selector.combobox {
             return buttons;
         }
 
+        protected isEditButtonNeeded(): boolean {
+            return this.isEditable();
+        }
+
         protected createView(content: T): api.dom.Element {
 
             let namesAndIconView = new api.app.NamesAndIconViewBuilder().setSize(this.size).build();