Compare commits

..

No commits in common. "a513a397179a0b9316d63122124d506c0e5ebd92" and "267eeca9d1cf5e1511df9970646af96a1d1da910" have entirely different histories.

7 changed files with 11 additions and 18 deletions

View File

@ -1,10 +1,3 @@
noodles 1.2.3 - 2023.11.04
===========================================================
* Require Dotclear 2.28
* Require PHP 8.1
* Upgrade to last minute change to Dotclear 2.28
* Fix typo
noodles 1.2.2 - 2023.10.19 noodles 1.2.2 - 2023.10.19
=========================================================== ===========================================================
* Require Dotclear 2.28 * Require Dotclear 2.28

View File

@ -1,7 +1,7 @@
# README # README
[![Release](https://img.shields.io/badge/release-1.2.3-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/noodles/releases) [![Release](https://img.shields.io/badge/release-1.2.2-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/noodles/releases)
![Date](https://img.shields.io/badge/date-2023.11.04-c44d58.svg) ![Date](https://img.shields.io/badge/date-2023.10.19-c44d58.svg)
[![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download) [![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/noodles) [![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/noodles)
[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/noodles/src/branch/master/LICENSE) [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/noodles/src/branch/master/LICENSE)
@ -32,7 +32,6 @@ go to ''configure plugin'', fill in form.
* [Packages & details](https://git.dotclear.watch/JcDenis/noodles/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/noodles)) * [Packages & details](https://git.dotclear.watch/JcDenis/noodles/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/noodles))
* [Sources & contributions](https://git.dotclear.watch/JcDenis/noodles) (or on [GitHub](https://github.com/JcDenis/noodles)) * [Sources & contributions](https://git.dotclear.watch/JcDenis/noodles) (or on [GitHub](https://github.com/JcDenis/noodles))
* [Issues & security](https://git.dotclear.watch/JcDenis/noodles/issues) (or on [GitHub](https://github.com/JcDenis/noodles/issues)) * [Issues & security](https://git.dotclear.watch/JcDenis/noodles/issues) (or on [GitHub](https://github.com/JcDenis/noodles/issues))
* [Discuss & help](https://forum.dotclear.org/viewtopic.php?id=39993)
## CONTRIBUTORS ## CONTRIBUTORS

View File

@ -17,7 +17,7 @@ $this->registerModule(
'Noodles', 'Noodles',
'Add users gravatars everywhere', 'Add users gravatars everywhere',
'Jean-Christian Denis and contributors', 'Jean-Christian Denis and contributors',
'1.2.3', '1.2.2',
[ [
'requires' => [['core', '2.28']], 'requires' => [['core', '2.28']],
'permissions' => 'My', 'permissions' => 'My',

View File

@ -2,10 +2,10 @@
<modules xmlns:da="http://dotaddict.org/da/"> <modules xmlns:da="http://dotaddict.org/da/">
<module id="noodles"> <module id="noodles">
<name>Noodles</name> <name>Noodles</name>
<version>1.2.3</version> <version>1.2.2</version>
<author>Jean-Christian Denis and contributors</author> <author>Jean-Christian Denis and contributors</author>
<desc>Add users gravatars everywhere</desc> <desc>Add users gravatars everywhere</desc>
<file>https://git.dotclear.watch/JcDenis/noodles/releases/download/v1.2.3/plugin-noodles.zip</file> <file>https://git.dotclear.watch/JcDenis/noodles/releases/download/v1.2.2/plugin-noodles.zip</file>
<da:dcmin>2.28</da:dcmin> <da:dcmin>2.28</da:dcmin>
<da:details>https://git.dotclear.watch/JcDenis/noodles/src/branch/master/README.md</da:details> <da:details>https://git.dotclear.watch/JcDenis/noodles/src/branch/master/README.md</da:details>
<da:support>https://git.dotclear.watch/JcDenis/noodles/issues</da:support> <da:support>https://git.dotclear.watch/JcDenis/noodles/issues</da:support>

View File

@ -33,7 +33,7 @@ class Frontend extends Process
return false; return false;
} }
App::frontend()->template()->appendPath(My::path() . '/default-templates'); App::frontend()->template()->setPath(App::frontend()->template()->getPath(), My::path() . '/default-templates');
foreach ($targets->dump() as $target) { foreach ($targets->dump() as $target) {
if ($target->active() && $target->hasPhpCallback()) { if ($target->active() && $target->hasPhpCallback()) {

View File

@ -179,9 +179,9 @@ class Manage extends Process
'<img alt="nok" src="images/check-off.png" />' '<img alt="nok" src="images/check-off.png" />'
) . '</td> ) . '</td>
<td><img alt="ok" src="images/check-on.png" /></td> <td><img alt="ok" src="images/check-on.png" /></td>
<td>' . (new Input(['noodle[' . $target->id . '][target]']))->size(20)->maxlength(255)->value($target->target())->render() . '</td> <td>' . (new Input(['noodle[' . $target->id . '][target]']))->size(20)->maxlenght(255)->value($target->target())->render() . '</td>
<td>' . (new Select(['noodle[' . $target->id . '][place]']))->items(Combo::place())->default($target->place())->render() . '</td> <td>' . (new Select(['noodle[' . $target->id . '][place]']))->items(Combo::place())->default($target->place())->render() . '</td>
<td>' . (new Input(['noodle[' . $target->id . '][css]']))->size(20)->maxlength(255)->value($target->css())->render() . '</td> <td>' . (new Input(['noodle[' . $target->id . '][css]']))->size(20)->maxlenght(255)->value($target->css())->render() . '</td>
<td> .noodles-' . $target->id . '{}</td> <td> .noodles-' . $target->id . '{}</td>
</tr>'; </tr>';
} }

View File

@ -26,8 +26,9 @@ class My extends MyPlugin
protected static function checkCustomContext(int $context): ?bool protected static function checkCustomContext(int $context): ?bool
{ {
return match ($context) { return match ($context) {
// Add content admin perm to backend // Allow BACKEND and MANAGE and MENU to also content admin
self::MANAGE, self::MENU => App::task()->checkContext('BACKEND') self::BACKEND, self::MANAGE, self::MENU => App::task()->checkContext('BACKEND')
&& App::blog()->isDefined()
&& App::auth()->check(App::auth()->makePermissions([ && App::auth()->check(App::auth()->makePermissions([
App::auth()::PERMISSION_CONTENT_ADMIN, App::auth()::PERMISSION_CONTENT_ADMIN,
]), App::blog()->id()), ]), App::blog()->id()),