Ajout de dépendance manquante
Patch de GLPI pour masquer une partie du formulaire selfService
This commit is contained in:
parent
7286b4dcff
commit
163cc74b50
@ -35,15 +35,18 @@ apk add \
|
|||||||
php7-mbstring \
|
php7-mbstring \
|
||||||
php7-simplexml \
|
php7-simplexml \
|
||||||
php7-iconv \
|
php7-iconv \
|
||||||
php7-sodium
|
php7-sodium \
|
||||||
|
php7-phar
|
||||||
|
|
||||||
COPY CAS-1.3.8.tgz /root/
|
COPY CAS-1.3.8.tgz /root/
|
||||||
RUN pear install /root/CAS-1.3.8.tgz
|
RUN pear install /root/CAS-1.3.8.tgz && \
|
||||||
|
pear install Archive_Tar
|
||||||
COPY httpd.conf /etc/apache2
|
COPY httpd.conf /etc/apache2
|
||||||
COPY service/ /etc/service/
|
COPY service/ /etc/service/
|
||||||
COPY glpi_init.sh /root/glpi_init.sh
|
COPY glpi_init.sh /root/glpi_init.sh
|
||||||
COPY glpi.cron /var/spool/cron/crontabs/apache
|
COPY glpi.cron /var/spool/cron/crontabs/apache
|
||||||
COPY initrc /etc/
|
COPY initrc /etc/
|
||||||
|
COPY glpi_ticket.class.php.patch /root/
|
||||||
ADD https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz /root/glpi-${GLPI_VERSION}.tgz
|
ADD https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz /root/glpi-${GLPI_VERSION}.tgz
|
||||||
ADD https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FUSIONINVENTORY_VERSION}/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2 /root/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2
|
ADD https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FUSIONINVENTORY_VERSION}/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2 /root/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ EOF
|
|||||||
php bin/console glpi:plugin:activate fusioninventory -n
|
php bin/console glpi:plugin:activate fusioninventory -n
|
||||||
rm install/install.php
|
rm install/install.php
|
||||||
chown -R apache:apache /var/www/glpi /etc/glpi /var/lib/glpi /var/log/glpi
|
chown -R apache:apache /var/www/glpi /etc/glpi /var/lib/glpi /var/log/glpi
|
||||||
|
patch -Np0 -i /root/glpi_ticket.class.php.patch
|
||||||
msglog green "Initialazing complete..."
|
msglog green "Initialazing complete..."
|
||||||
else
|
else
|
||||||
msglog green "GLPI is already initialized"
|
msglog green "GLPI is already initialized"
|
||||||
@ -76,4 +77,6 @@ else
|
|||||||
php bin/console db:update --config-dir=${GLPI_CONFIG_DIR} -n
|
php bin/console db:update --config-dir=${GLPI_CONFIG_DIR} -n
|
||||||
php bin/console glpi:maintenance:disable -n
|
php bin/console glpi:maintenance:disable -n
|
||||||
chown -R apache:apache /var/www/glpi /etc/glpi /var/lib/glpi /var/log/glpi
|
chown -R apache:apache /var/www/glpi /etc/glpi /var/lib/glpi /var/log/glpi
|
||||||
|
patch -Np0 -i /root/glpi_ticket.class.php.patch
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
19
alpine/glpi_ticket.class.php.patch
Normal file
19
alpine/glpi_ticket.class.php.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- inc/ticket.class.php.old 2020-07-16 14:26:59.000000000 +0200
|
||||||
|
+++ inc/ticket.class.php 2020-09-11 18:09:43.200657894 +0200
|
||||||
|
@@ -3806,7 +3806,7 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (empty($delegating)
|
||||||
|
+/** if (empty($delegating)
|
||||||
|
&& NotificationTargetTicket::isAuthorMailingActivatedForHelpdesk()) {
|
||||||
|
echo "<tr class='tab_bg_1'>";
|
||||||
|
echo "<td>".__('Inform me about the actions taken')."</td>";
|
||||||
|
@@ -3821,6 +3821,7 @@
|
||||||
|
|
||||||
|
echo "</td></tr>";
|
||||||
|
}
|
||||||
|
+*/
|
||||||
|
if (($_SESSION["glpiactiveprofile"]["helpdesk_hardware"] != 0)
|
||||||
|
&& (count($_SESSION["glpiactiveprofile"]["helpdesk_item_type"]))) {
|
||||||
|
if (!$tt->isHiddenField('items_id')) {
|
Loading…
Reference in New Issue
Block a user