Skip to content

Commit

Permalink
Arreglos para versión 9.3 de GLPI.
Browse files Browse the repository at this point in the history
  • Loading branch information
12420165G authored and 12420165G committed Nov 16, 2018
1 parent cf2d53a commit 02e070d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion inc/rule.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ function showSpecificCriteriasForPreview($fields) {
* @return string
*/
public function getCriteriasFromObject(CommonDBTM $object, $criteria_or_action) {
$criterias = $object->getSearchOptions();
$criterias = $object->rawSearchOptions();

// for infocom table
$criterias = array_merge($criterias, $this::getInfocomCriterias($object, $criteria_or_action));
Expand Down
Binary file added pics/logo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@
</authors>
<versions>
<version>
<num>1.0.0</num>
<compatibility>0.90.x</compatibility>
<num>0.1.0</num>
<compatibility>9.1</compatibility>
</version>
<version>
<num>0.2.0</num>
<compatibility>9.3</compatibility>
</version>
</versions>
<langs>
<lang>es_ES</lang>
Expand Down
8 changes: 4 additions & 4 deletions setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ function plugin_init_rules() {
*/
function plugin_version_rules() {
return array('name' => __('Rules', 'rules'),
'version' => '0.1.1',
'version' => '0.2.0',
'author' => 'Javier Samaniego',
'license' => 'AGPLv3+',
'homepage' => 'https://github.com/jsamaniegog/rules',
'minGlpiVersion' => '9.1');
'minGlpiVersion' => '9.3');
}

/**
* Fonction de vérification des prérequis
* @return boolean
*/
function plugin_rules_check_prerequisites() {
if (version_compare(GLPI_VERSION, '9.1', 'lt')) {
_e('This plugin requires GLPI >= 9.1', 'rules');
if (version_compare(GLPI_VERSION, '9.3', 'lt')) {
_e('This plugin requires GLPI >= 9.3', 'rules');
return false;
}

Expand Down

0 comments on commit 02e070d

Please sign in to comment.