Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ab2d7d86aa | |||
| 7c2d8fdf23 |
@@ -1,66 +0,0 @@
|
||||
name: Pre-Release Package
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: "Version (e.g. 1.0.0-alpha.1)"
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Determine version
|
||||
id: version
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
||||
echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
|
||||
echo "TAG=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
VERSION="${GITHUB_REF#refs/tags/v}"
|
||||
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
|
||||
echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Build package zip
|
||||
run: |
|
||||
cd source
|
||||
for dir in packages/*/; do
|
||||
pkg_name=$(basename "$dir")
|
||||
cd "$dir"
|
||||
zip -r "../../${pkg_name}.zip" . -x "*.git*"
|
||||
cd ../..
|
||||
done
|
||||
mkdir -p pkg_build
|
||||
mv *.zip pkg_build/
|
||||
cp pkg_*.xml pkg_build/ 2>/dev/null || true
|
||||
cp script.php pkg_build/ 2>/dev/null || true
|
||||
cd pkg_build
|
||||
zip -r "../${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip" .
|
||||
|
||||
- name: Create Pre-Release
|
||||
uses: actions/create-release@v1
|
||||
id: create_release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ steps.version.outputs.TAG }}
|
||||
release_name: "${{ github.event.repository.name }} ${{ steps.version.outputs.TAG }}"
|
||||
draft: false
|
||||
prerelease: true
|
||||
|
||||
- name: Upload Release Asset
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./source/${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip
|
||||
asset_name: ${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip
|
||||
asset_content_type: application/zip
|
||||
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 01.07.34
|
||||
# VERSION: 01.07.25
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
@@ -1,13 +1,6 @@
|
||||
# MokoSuite NPO
|
||||
Nonprofit management for MokoSuite. Layer 2 add-on (requires CRM).
|
||||
|
||||
## [Unreleased]
|
||||
### Added
|
||||
- **Admin menu short-name constant** — the Administrator → Components menu now shows a compact label via `COM_MOKOSUITENPO_SHORT` ("NPO"); defined in the admin sys.ini (#37)
|
||||
|
||||
### Fixed
|
||||
- Installer no longer shows the "license / next-steps" success message when a bundled child extension failed to install. The package `postflight` now verifies every child declared in the manifest actually landed in `#__extensions` and shows an honest error instead. Fails open so a transient glitch never fakes a failure.
|
||||
|
||||
## Features
|
||||
- Donor management with giving levels
|
||||
- Donation tracking with fund allocation
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
COM_MOKOSUITENPO="MokoSuite NPO"
|
||||
COM_MOKOSUITENPO_SHORT="NPO"
|
||||
COM_MOKOSUITENPO_XML_DESCRIPTION="MokoSuite NPO component."
|
||||
@@ -7,16 +7,13 @@
|
||||
<license>GPL-3.0-or-later</license>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
<authorUrl>https://mokoconsulting.tech</authorUrl>
|
||||
<version>01.07.34</version>
|
||||
<version>01.07.25</version>
|
||||
<php_minimum>8.3</php_minimum>
|
||||
<description>COM_MOKOSUITENPO_XML_DESCRIPTION</description>
|
||||
<description>MokoSuite NPO component</description>
|
||||
<namespace path="src">Moko\Component\MokoSuiteNpo</namespace>
|
||||
<administration>
|
||||
<menu>COM_MOKOSUITENPO_SHORT</menu>
|
||||
<files folder="admin"><folder>language</folder><folder>src</folder><folder>services</folder><folder>tmpl</folder></files>
|
||||
<languages folder="admin/language">
|
||||
<language tag="en-GB">en-GB/com_mokosuitenpo.sys.ini</language>
|
||||
</languages>
|
||||
<menu>MokoSuite NPO</menu>
|
||||
<files folder="admin"><folder>src</folder><folder>services</folder><folder>tmpl</folder></files>
|
||||
</administration>
|
||||
<files folder="site"><folder>src</folder><folder>tmpl</folder></files>
|
||||
<api><files folder="api"><folder>src</folder></files></api>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuite NPO</name>
|
||||
<packagename>mokosuitenpo</packagename>
|
||||
<version>01.07.34</version>
|
||||
<version>01.07.25</version>
|
||||
<creationDate>2026-06-11</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -19,112 +19,9 @@ class Pkg_MokoSuiteNPOInstallerScript
|
||||
{
|
||||
public function postflight(string $type, InstallerAdapter $adapter): void
|
||||
{
|
||||
// Be honest about success. Joomla's package installer only LOGS a failed
|
||||
// child sub-install but still runs this postflight, so don't show the
|
||||
// license / next-steps message if a bundled extension is actually missing.
|
||||
// Fails open (see missingChildExtensions) so a glitch never fakes a failure.
|
||||
$missing = $this->missingChildExtensions($adapter);
|
||||
|
||||
if (!empty($missing))
|
||||
{
|
||||
Factory::getApplication()->enqueueMessage(
|
||||
'<h4>MokoSuiteNPO did not install correctly.</h4>'
|
||||
. '<p>The following bundled extensions are missing: '
|
||||
. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '</p>'
|
||||
. '<p>Please uninstall MokoSuiteNPO and reinstall the full package.</p>',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->warnMissingLicenseKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify every child extension declared in the package manifest actually
|
||||
* landed in #__extensions. Returns readable labels of any that are missing.
|
||||
*
|
||||
* Matching per Joomla's #__extensions uniqueness:
|
||||
* - type = the <file> "type" attribute
|
||||
* - element = the <file> "id" attribute, EXCEPT for plugins where the
|
||||
* manifest declares the full plg_<group>_<element> id, so a
|
||||
* leading plg_<group>_ is stripped to get the real element
|
||||
* - plugins ALSO match folder = the <file> "group" attribute
|
||||
*
|
||||
* FAILS OPEN: any error (unreadable manifest, query failure) returns [] so a
|
||||
* transient glitch never turns a good install into a false failure.
|
||||
*
|
||||
* @param InstallerAdapter $adapter The package installer adapter.
|
||||
*
|
||||
* @return string[] Labels of missing child extensions.
|
||||
*/
|
||||
private function missingChildExtensions(InstallerAdapter $adapter): array
|
||||
{
|
||||
try
|
||||
{
|
||||
$manifest = $adapter->getParent()->getManifest();
|
||||
|
||||
if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
$db = Factory::getDbo();
|
||||
$missing = [];
|
||||
|
||||
foreach ($manifest->files->file as $file)
|
||||
{
|
||||
$attrs = $file->attributes();
|
||||
$id = isset($attrs['id']) ? (string) $attrs['id'] : '';
|
||||
$exType = isset($attrs['type']) ? (string) $attrs['type'] : '';
|
||||
|
||||
if ($id === '' || $exType === '')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$group = isset($attrs['group']) ? (string) $attrs['group'] : '';
|
||||
$element = $id;
|
||||
|
||||
// Plugin element in #__extensions is the id minus any leading plg_<group>_.
|
||||
if ($exType === 'plugin' && $group !== '')
|
||||
{
|
||||
$prefix = 'plg_' . $group . '_';
|
||||
|
||||
if (strpos($element, $prefix) === 0)
|
||||
{
|
||||
$element = substr($element, \strlen($prefix));
|
||||
}
|
||||
}
|
||||
|
||||
$query = $db->getQuery(true)
|
||||
->select('COUNT(*)')
|
||||
->from($db->quoteName('#__extensions'))
|
||||
->where($db->quoteName('element') . ' = ' . $db->quote($element))
|
||||
->where($db->quoteName('type') . ' = ' . $db->quote($exType));
|
||||
|
||||
if ($exType === 'plugin' && $group !== '')
|
||||
{
|
||||
$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
|
||||
}
|
||||
|
||||
if ((int) $db->setQuery($query)->loadResult() === 0)
|
||||
{
|
||||
$label = trim((string) $file);
|
||||
$missing[] = $label !== '' ? preg_replace('/\.zip$/i', '', $label) : $id;
|
||||
}
|
||||
}
|
||||
|
||||
return $missing;
|
||||
}
|
||||
catch (\Throwable $e)
|
||||
{
|
||||
// Fail open — never fake a failure on a glitch.
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
private function warnMissingLicenseKey(): void
|
||||
{
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user