Skip to content

Commit 1583947

Browse files
committed
Add fixes
1 parent 5a9565f commit 1583947

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
# Sequence of patterns matched against refs/tags
55
tags:
6-
- '*.*.*' # Push events to matching ex:20.15.10
6+
- '*.*.*' # Push events to matching ex:20.15.10
77

88
name: Create release with tag
99
env:
@@ -14,33 +14,29 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
18-
- name: Setup PHP
19-
uses: shivammathur/setup-php@v2
20-
with:
21-
php-version: 7.4
17+
uses: actions/checkout@v2
2218
- name: Build project # This would actually build your project, using zip for an example artifact
2319
id: build_
2420
env:
25-
GITHUB_NAME: ${{ github.event.repository.name }}
26-
27-
28-
run: php -v ;sudo apt-get install libxml-xpath-perl; sudo apt-get install composer;echo $(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml);echo ::set-output name=version_glpi::$(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml); [[ -f composer.json ]] && composer install --no-dev; rm -rf $GITHUB_NAME.xml tools wiki screenshots test .git .github ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png;cd ..; tar -jcvf glpi-$GITHUB_NAME-${GITHUB_REF/refs\/tags\//}.tar.bz2 $GITHUB_NAME;ls -al;echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//};echo ${{ steps.getxml.outputs.info }};
29-
# run: rm -rf $GITHUB_NAME.xml tools wiki screenshots test ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png; tar -zcvf glpi-$GITHUB_NAME-$GITHUB_TAG.tar.bz2 $GITHUB_NAME
21+
GITHUB_NAME: ${{ github.event.repository.name }}
22+
23+
24+
run: sudo apt-get install libxml-xpath-perl;echo $(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml);echo ::set-output name=version_glpi::$(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml); rm -rf $GITHUB_NAME.xml tools wiki screenshots test .git .github ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png;cd ..; tar jcvf glpi-$GITHUB_NAME-${GITHUB_REF/refs\/tags\//}.tar.bz2 $GITHUB_NAME;ls -al;echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//};echo ${{ steps.getxml.outputs.info }};
25+
# run: rm -rf $GITHUB_NAME.xml tools wiki screenshots test ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png; tar -zcvf glpi-$GITHUB_NAME-$GITHUB_TAG.tar.gz $GITHUB_NAME
3026
- name: Create Release
3127
id: create_release
3228
uses: actions/create-release@v1
3329
env:
3430
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3531
with:
3632
tag_name: ${{ github.ref }}
37-
release_name: |
38-
GLPI ${{ steps.build_.outputs.version_glpi }} : Version ${{ github.ref }} disponible / available
33+
release_name: |
34+
GLPI ${{ steps.build_.outputs.version_glpi }} : Version ${{ github.ref }} disponible / available
3935
body : Version ${{ steps.build_.outputs.tag }} released for GLPI ${{ steps.build_.outputs.version_glpi }}
4036
draft: false
4137
prerelease: true
4238
- name: Upload Release Asset
43-
id: upload-release-asset
39+
id: upload-release-asset
4440
uses: actions/upload-release-asset@v1
4541
env:
4642
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/Notificationtargettask.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ function addDataForTemplate($event, $options = [])
183183
// $this->data['##lang.task.realtime##'] = __('Effective duration', 'resources');
184184
// $this->data['##lang.task.finished##'] = __('Carried out task', 'resources');
185185
// $this->data['##lang.task.comment##'] = __('Comments');
186-
// $this->data['##lang.task.resource##'] = PluginResourcesResource::getTypeName(1);
186+
// $this->data['##lang.task.resource##'] = Resource::getTypeName(1);
187187
//
188188
// foreach ($options['tasks'] as $id => $task) {
189189
// $tmp = [];

src/Task.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ function listOfTemplates($target, $add = 0)
13061306
$colsup = 0;
13071307
}
13081308

1309-
echo "<div align='center'><table class='tab_cadre_fixe'>";
1309+
echo "<div class='center'><table class='tab_cadre_fixe'>";
13101310
if ($add) {
13111311
echo "<tr><th colspan='" . (2 + $colsup) . "'>" . __('Choose a template', 'tasklists') . " - " . self::getTypeName(
13121312
2

src/Typevisibility.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function showVisibilities($item)
164164
echo "<form name='form' method='post' action='" .
165165
Toolbox::getItemTypeFormURL(TypeVisibility::class) . "'>";
166166

167-
echo "<div align='center'><table class='tab_cadre_fixe'>";
167+
echo "<div class='center'><table class='tab_cadre_fixe'>";
168168
echo "<tr><th colspan='6'>" . __('Add a group', 'tasklists') . "</th></tr>";
169169

170170
echo "<tr class='tab_bg_1'>";

0 commit comments

Comments
 (0)