Link directive display wrong reset button if empty object exists. closes

#1536
luyadev · Oct 9, 2017 · 8d65142 · 8d65142
1 parent 3610628
commit 8d65142
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file. This projec
 
 ### Fixed
 
+- [#1536](https://github.com/luyadev/luya/issues/1536) Link directive display wrong reset data button if empty object exists.
 - [#1533](https://github.com/luyadev/luya/issues/1533) Draft mode does not display first created version. Hide elements when page is draft.
 - [#1526](https://github.com/luyadev/luya/issues/1526) Changed has-enough-space directive to use direct parent of element to check if there is enough space.
 - [#1509](https://github.com/luyadev/luya/issues/1509) Added a table-responsive-wrapper div to all responsive tables. This improves CRUD behaviour on mobile.

diff --git a/modules/admin/src/resources/dist/js/main.js b/modules/admin/src/resources/dist/js/main.js
@@ -11485,7 +11485,7 @@ zaa.factory('HtmlStorage', function() {
                                     '<i class="material-icons left">insert_link</i>' +
                                     '<span>' + i18n['js_link_set_value'] + '</span>' +
                                 '</div>' +
-                                '<span class="link-selector-reset" ng-click="unset()"><i class="material-icons">remove_circle</i></span>' +
+                                '<span ng-hide="model | isEmpty" class="link-selector-reset" ng-click="unset()"><i class="material-icons">remove_circle</i></span>' +
                             '</div>' +
                             '<p class="link-selector-path"><link-object-to-string link="model"></link-object-to-string></p>' +
                         '</div>' +
@@ -11506,7 +11506,6 @@ zaa.factory('HtmlStorage', function() {
                             '<update-form-redirect data="data.model"></update-form-redirect>' +
                         '</div>' +
                         '<div class="modal-footer">'+
-                            '<button ng-click="unset(); data.modalState=1" type="button" class="btn btn-icon btn-cancel"></button> '+
                             '<button ng-click="data.modalState=1" class="btn btn-icon btn-save" type="button">'+i18n['js_link_set_value']+'</button>' +
                         '</div>'+
                     '</modal>'+

diff --git a/modules/admin/src/resources/js/directives.js b/modules/admin/src/resources/js/directives.js
@@ -895,7 +895,7 @@
                                     '<i class="material-icons left">insert_link</i>' +
                                     '<span>' + i18n['js_link_set_value'] + '</span>' +
                                 '</div>' +
-                                '<span class="link-selector-reset" ng-click="unset()"><i class="material-icons">remove_circle</i></span>' +
+                                '<span ng-hide="model | isEmpty" class="link-selector-reset" ng-click="unset()"><i class="material-icons">remove_circle</i></span>' +
                             '</div>' +
                             '<p class="link-selector-path"><link-object-to-string link="model"></link-object-to-string></p>' +
                         '</div>' +
@@ -916,7 +916,6 @@
                             '<update-form-redirect data="data.model"></update-form-redirect>' +
                         '</div>' +
                         '<div class="modal-footer">'+
-                            '<button ng-click="unset(); data.modalState=1" type="button" class="btn btn-icon btn-cancel"></button> '+
                             '<button ng-click="data.modalState=1" class="btn btn-icon btn-save" type="button">'+i18n['js_link_set_value']+'</button>' +
                         '</div>'+
                     '</modal>'+