From 759fafdfa73f2b313ce7e1163eb434006bd7ef55 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Tue, 22 Sep 2020 13:27:54 +0200 Subject: [PATCH] ++ --- zero.Core/Extensions/RavenQueryableExtensions.cs | 16 ++++++++-------- .../App/components/buttons/icon-button.vue | 2 +- zero.Web.UI/App/components/tree/tree-item.vue | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/zero.Core/Extensions/RavenQueryableExtensions.cs b/zero.Core/Extensions/RavenQueryableExtensions.cs index dc4e7e15..efc509d5 100644 --- a/zero.Core/Extensions/RavenQueryableExtensions.cs +++ b/zero.Core/Extensions/RavenQueryableExtensions.cs @@ -24,10 +24,10 @@ namespace zero.Core.Extensions HashSet ids = new HashSet(); ids.Add(appId); - //if (includeShared) - //{ - // ids.Add(Constants.Database.SharedAppId); - //} + if (includeShared) + { + ids.Add(Constants.Database.SharedAppId); + } return source.Where(item => (item as IAppAwareEntity).AppId.In(ids)); } @@ -48,10 +48,10 @@ namespace zero.Core.Extensions HashSet ids = new HashSet(); ids.Add(scope.AppId); - //if (scope.IncludeShared) - //{ - // ids.Add(Constants.Database.SharedAppId); - //} + if (scope.IncludeShared) + { + ids.Add(Constants.Database.SharedAppId); + } return source.Where(item => ((IAppAwareEntity)item).AppId.In(ids)); } diff --git a/zero.Web.UI/App/components/buttons/icon-button.vue b/zero.Web.UI/App/components/buttons/icon-button.vue index f5b57d34..ab8e3e38 100644 --- a/zero.Web.UI/App/components/buttons/icon-button.vue +++ b/zero.Web.UI/App/components/buttons/icon-button.vue @@ -25,7 +25,7 @@ }, title: { type: String, - default: '@ui.back' + default: '' }, disabled: Boolean }, diff --git a/zero.Web.UI/App/components/tree/tree-item.vue b/zero.Web.UI/App/components/tree/tree-item.vue index 1156e172..92010164 100644 --- a/zero.Web.UI/App/components/tree/tree-item.vue +++ b/zero.Web.UI/App/components/tree/tree-item.vue @@ -136,6 +136,7 @@ &.is-disabled { cursor: not-allowed; + opacity: .5; } &.is-active:before