From 03f0cef35554aab0df3fe3bc323c985583786c80 Mon Sep 17 00:00:00 2001 From: Simon Annetts Date: Thu, 6 Mar 2025 16:07:33 +0000 Subject: [PATCH 1/2] #52 Update cloudscribe-develop.yml --- .github/workflows/cloudscribe-develop.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cloudscribe-develop.yml b/.github/workflows/cloudscribe-develop.yml index d299938..087ac5c 100644 --- a/.github/workflows/cloudscribe-develop.yml +++ b/.github/workflows/cloudscribe-develop.yml @@ -6,6 +6,7 @@ name: cloudscribe-kvp-develop-nuget-build on: push: branches: [ "develop" ] + workflow_dispatch: # pull_request: # branches: [ "develop" ] @@ -30,3 +31,9 @@ jobs: run: dotnet pack -c Release - name: Publish NuGet package run: dotnet nuget push **/*.nupkg --source ${{ secrets.NUGET_SOURCE_URL }} + - name: Remote Repository Dispatch + uses: peter-evans/repository-dispatch@v3 + with: + token: ${{ secrets.GHB_PAT }} + repository: GreatHouseBarn/cloudscribe-testing + event-type: cs.UserProperties.Kvp From 86cb4e00eb0da58f4fb35c3a5a57b938684340a2 Mon Sep 17 00:00:00 2001 From: Simon Annetts Date: Thu, 13 Mar 2025 17:59:42 +0000 Subject: [PATCH 2/2] #55 conditionally add UserExportPartial to index_kvp --- .../Views/UserAdmin/Index_kvp.cshtml | 6 ++++++ .../cloudscribe.Kvp.Views.BS5.csproj | 2 +- .../cloudscribe.UserProperties.Kvp.csproj | 6 +++--- src/sourceDev.WebApp/sourceDev.WebApp.csproj | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/cloudscribe.Kvp.Views.BS5/Views/UserAdmin/Index_kvp.cshtml b/src/cloudscribe.Kvp.Views.BS5/Views/UserAdmin/Index_kvp.cshtml index 48cdbca..0561e35 100644 --- a/src/cloudscribe.Kvp.Views.BS5/Views/UserAdmin/Index_kvp.cshtml +++ b/src/cloudscribe.Kvp.Views.BS5/Views/UserAdmin/Index_kvp.cshtml @@ -1,5 +1,7 @@ @using cloudscribe.UserProperties.Models @model cloudscribe.Core.Web.ViewModels.UserAdmin.UserListViewModel +@using Microsoft.AspNetCore.Mvc.ViewEngines +@inject ICompositeViewEngine Engine @inject ICoreThemeHelper themeHelper @inject IStringLocalizer sr @inject IUserPropertyService _userPropertyService @@ -43,6 +45,10 @@ +@if (Engine.FindView(ViewContext, "UserExportPartial", false).Success) +{ // only show export button if the view exists in cloudscribe.core.compiledviews.bootstrap5 >= 8.0.18 + +} @section SideNav { } diff --git a/src/cloudscribe.Kvp.Views.BS5/cloudscribe.Kvp.Views.BS5.csproj b/src/cloudscribe.Kvp.Views.BS5/cloudscribe.Kvp.Views.BS5.csproj index da9499d..143963d 100644 --- a/src/cloudscribe.Kvp.Views.BS5/cloudscribe.Kvp.Views.BS5.csproj +++ b/src/cloudscribe.Kvp.Views.BS5/cloudscribe.Kvp.Views.BS5.csproj @@ -3,7 +3,7 @@ net8.0 true - 8.0.0 + 8.0.1 Custom views for cloudscribe.Kvp cloudscribe;kvp;commands;ef icon.png diff --git a/src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj b/src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj index 127e123..81f4100 100644 --- a/src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj +++ b/src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj @@ -2,7 +2,7 @@ Configurable custom user properties for cloudscribe core using per tenant or global configuration based custom proprties with key/value storage - 8.0.0 + 8.0.1 net8.0 Joe Audette cloudscribe;userprofile;customization @@ -24,8 +24,8 @@ - - + + diff --git a/src/sourceDev.WebApp/sourceDev.WebApp.csproj b/src/sourceDev.WebApp/sourceDev.WebApp.csproj index c95be75..78cde5f 100644 --- a/src/sourceDev.WebApp/sourceDev.WebApp.csproj +++ b/src/sourceDev.WebApp/sourceDev.WebApp.csproj @@ -48,7 +48,7 @@ - +