Skip to content

Fix errant '>' in Time Range #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertjf merged 2 commits into from
Jul 27, 2026
Merged

Fix errant '>' in Time Range #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3319e9
cleanup
robertjf Jul 27, 2026
14319c3
Fix errant '>' in Time Range
robertjf Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:

- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
uses: actions/setup-dotnet@v4

with:
dotnet-version: ${{ matrix.dotnet-version }}

Expand Down Expand Up @@ -73,30 +72,30 @@ jobs:
- name: Create the package
run: dotnet pack ${{ env.PLUGIN_PROJECT }} --no-build --no-restore --configuration Release -o ${{ env.OUTPUT_PATH }}

- name: Publish to NuGet
if: github.event_name == 'release'
working-directory: ${{ env.OUTPUT_PATH }}
run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }}
# - name: Publish to NuGet
# if: github.event_name == 'release'
# working-directory: ${{ env.OUTPUT_PATH }}
# run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }}

- uses: avakar/tag-and-release@v1
if: github.event_name == 'release'
name: Create Release Tag v${{ steps.package_version.outputs.version }}
id: release
with:
tag_name: v${{ steps.package_version.outputs.version }}
prerelease: ${{ steps.check_prerelease.outputs.prerelease }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# - uses: avakar/tag-and-release@v1
# if: github.event_name == 'release'
# name: Create Release Tag v${{ steps.package_version.outputs.version }}
# id: release
# with:
# tag_name: v${{ steps.package_version.outputs.version }}
# prerelease: ${{ steps.check_prerelease.outputs.prerelease }}
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Release information for v${{ steps.package_version.outputs.version }}
if: github.event_name == 'release'
run: |
echo Release Id: ${{ steps.release.outputs.id }}
echo Upload URL: ${{ steps.release.outputs.upload_url }}
echo Release URL: ${{ steps.release.outputs.html_url }}
# - name: Release information for v${{ steps.package_version.outputs.version }}
# if: github.event_name == 'release'
# run: |
# echo Release Id: ${{ steps.release.outputs.id }}
# echo Upload URL: ${{ steps.release.outputs.upload_url }}
# echo Release URL: ${{ steps.release.outputs.html_url }}

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: nuget
path: ${{ env.OUTPUT_PATH }}/
# - name: Upload artifacts
# uses: actions/upload-artifact@v4
# with:
# name: nuget
# path: ${{ env.OUTPUT_PATH }}/
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,3 +383,4 @@ FodyWeavers.xsd
/OpenOrClosed/wwwroot/App_Plugins
OpenOrClosed.TestSite/appsettings-schema.*
OpenOrClosed.TestSite/umbraco-package-schema.json
*.csproj.lscache
11 changes: 6 additions & 5 deletions OpenOrClosed.TestSite/OpenOrClosed.TestSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<CompressionEnabled>false</CompressionEnabled> <!-- Disable compression. E.g. for umbraco backoffice files. These files should be precompressed by node and not let dotnet handle it -->
<UserSecretsId>246793cb-3074-46b6-9809-adcd43b955e5</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="17.4.2" />
<PackageReference Include="Umbraco.Cms.DevelopmentMode.Backoffice" Version="17.4.2" />
<!-- <PackageReference Include="OpenOrClosed" Version="17.1.2" /> -->
<PackageReference Include="Umbraco.Cms" Version="18.0.2" />
<PackageReference Include="Umbraco.Cms.DevelopmentMode.Backoffice" Version="18.0.2" />
</ItemGroup>

<ItemGroup>
Expand All @@ -18,8 +20,7 @@
</ItemGroup>

<ItemGroup>
<!-- <ProjectReference Include="../OpenOrClosed.Core/OpenOrClosed.Core.csproj" /> -->
<ProjectReference Include="../OpenOrClosed/OpenOrClosed.csproj" />
<ProjectReference Include=".. /OpenOrClosed/OpenOrClosed.csproj" />
</ItemGroup>

<PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions OpenOrClosed/Client/src/shared/business-hours-base.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ export abstract class BusinessHoursBaseElement<T extends BaseDayInterface, C ext
label="Open time"
?required=${!this._config.excludeTimes && !this._config.hoursOptional}
${umbBindToValidation(this, `opensAt_${dayIndex}_${hoursIndex}`)}
>
>
</uui-input>
<span>to</span>
<uui-input
Expand All @@ -475,8 +475,8 @@ export abstract class BusinessHoursBaseElement<T extends BaseDayInterface, C ext
?error=${this._hasValidationError(dayIndex, hoursIndex, 'closesAt')}
.errorMessage=${this._validateTimeField(dayIndex, hoursIndex, 'closesAt')}
?required=${!this._config.excludeTimes && !this._config.hoursOptional && !this._config.closedHoursOptional}
${umbBindToValidation(this, `closesAt_${dayIndex}_${hoursIndex}`)}>
>
${umbBindToValidation(this, `closesAt_${dayIndex}_${hoursIndex}`)}
>
</uui-input>
</div>
` : ''}
Expand Down
3 changes: 1 addition & 2 deletions OpenOrClosed/OpenOrClosed.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- NuGet package metadata -->
<PropertyGroup>
<Version>17.1.2</Version>
<Version>17.1.3</Version>
<Description>
Open or Closed - Yet another Business Hours package!

Expand All @@ -34,7 +34,6 @@
<PackageIcon>OpenOrClosed_logo.png</PackageIcon>
<PackageIconUrl>
https://raw.githubusercontent.com/YourITGroup/OpenOrClosed/master/assets/OpenOrClosed_logo.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/YourITGroup/OpenOrClosed</PackageProjectUrl>
<RepositoryUrl>https://github.com/YourITGroup/OpenOrClosed</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>umbraco umbraco-marketplace Business Hours</PackageTags>
Expand Down
Loading