";
- echo "
";
- echo "| ".__("List of translations")." |
";
- if ($canedit) {
- echo "";
- echo Html::getCheckAllAsCheckbox('mass'.__CLASS__.$rand);
- echo " | ";
- }
- echo "".__("Language", "fields")." | ";
- echo "".__("Label", "fields")." | ";
- foreach ($found as $data) {
- echo "";
+ 'language' => $_SESSION['glpilanguage'],
+ 'label' => $item->fields['label']
+ ]);
+ return true;
+ }
+
+ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
+ {
+ $nb = countElementsInTable(
+ self::getTable(),
+ [
+ 'itemtype' => $item::getType(),
+ 'items_id' => $item->getID(),
+ ]
+ );
+ return self::createTabEntry(self::getTypeName($nb), $nb);
+ }
+
+ public static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0)
+ {
+ self::showTranslations($item);
+ }
+
+ /**
+ * Display all translations for a label
+ *
+ * @param CommonDBTM $item Item instance
+ *
+ * @return void
+ */
+ public static function showTranslations(CommonDBTM $item)
+ {
+ $canedit = $item->can($item->getID(), UPDATE);
+ $rand = mt_rand();
+ if ($canedit) {
+ echo "";
+
+ $ajax_params = [
+ 'type' => __CLASS__,
+ 'itemtype' => $item::getType(),
+ 'items_id' => $item->fields['id'],
+ 'id' => -1
+ ];
+ echo Html::scriptBlock('
+ addTranslation' . $item->getID() . $rand . ' = function() {
+ $("#viewtranslation' . $item->getID() . $rand . '").load(
+ "' . Plugin::getWebDir('fields') . '/ajax/viewtranslations.php",
+ ' . json_encode($ajax_params) . '
+ );
+ };
+ ');
+
+ echo "
";
+ }
+
+ $obj = new self();
+ $found = $obj->find(
+ [
+ 'itemtype' => $item::getType(),
+ 'items_id' => $item->getID(),
+ ],
+ "language ASC"
+ );
+
+ if (count($found) > 0) {
if ($canedit) {
- echo "";
- Html::showMassiveActionCheckBox(__CLASS__, $data["id"]);
- echo " | ";
+ Html::openMassiveActionsForm('mass' . __CLASS__ . $rand);
+ $massiveactionparams = ['container' => 'mass' . __CLASS__ . $rand];
+ Html::showMassiveActions($massiveactionparams);
}
- echo "";
+ echo "";
+ echo " ";
+ echo "| " . __("List of translations") . " | ";
if ($canedit) {
- echo Html::scriptBlock('
- viewEditTranslation' . $data['id'] . $rand . ' = function() {
- $("#viewtranslation' . $item->getID() . $rand . '").load(
- "' . Plugin::getWebDir('fields') . '/ajax/viewtranslations.php",
- ' . json_encode([
- 'type' => __CLASS__,
- 'itemtype' => $item::getType(),
- 'items_id' => $item->getID(),
- 'id' => $data['id']
- ]) . '
- );
- };
- ');
+ echo "";
+ echo Html::getCheckAllAsCheckbox('mass' . __CLASS__ . $rand);
+ echo " | ";
+ }
+ echo "" . __("Language", "fields") . " | ";
+ echo "" . __("Label", "fields") . " | ";
+ foreach ($found as $data) {
+ echo "";
+ if ($canedit) {
+ echo "| ";
+ Html::showMassiveActionCheckBox(__CLASS__, $data["id"]);
+ echo " | ";
+ }
+ echo "";
+ if ($canedit) {
+ $ajax_params = [
+ 'type' => __CLASS__,
+ 'itemtype' => $item::getType(),
+ 'items_id' => $item->getID(),
+ 'id' => $data['id']
+ ];
+ echo Html::scriptBlock('
+ viewEditTranslation' . $data['id'] . $rand . ' = function() {
+ $("#viewtranslation' . $item->getID() . $rand . '").load(
+ "' . Plugin::getWebDir('fields') . '/ajax/viewtranslations.php",
+ ' . json_encode($ajax_params) . '
+ );
+ };
+ ');
+ }
+ echo Dropdown::getLanguageName($data['language']);
+ echo " | ";
+ echo $data['label'];
+ echo " | ";
}
- echo Dropdown::getLanguageName($data['language']);
- echo "";
- echo $data['label'];
- echo " | ";
- }
- echo "
";
- if ($canedit) {
- $massiveactionparams['ontop'] = false;
- Html::showMassiveActions($massiveactionparams);
- Html::closeForm();
- }
- } else {
- echo " ";
- echo "| ".__("No translation found")." |
";
- }
-
- return true;
- }
-
- /**
- * Display translation form
- *
- * @param string $itemtype Item type
- * @param int $items_id Item ID
- * @param int $id Translation ID (defaults to -1)
- *
- * @return void
+ echo " |
";
+ if ($canedit) {
+ $massiveactionparams['ontop'] = false;
+ Html::showMassiveActions($massiveactionparams);
+ Html::closeForm();
+ }
+ } else {
+ echo "
";
+ echo "| " . __("No translation found") . " |
";
+ }
+
+ return true;
+ }
+
+ /**
+ * Display translation form
+ *
+ * @param string $itemtype Item type
+ * @param int $items_id Item ID
+ * @param int $id Translation ID (defaults to -1)
+ *
+ * @return void
+ */
+ public function showFormForItem($itemtype, $items_id, $id = -1)
+ {
+ if ($id > 0) {
+ $this->check($id, READ);
+ } else {
+ // Create item
+ $this->check(-1, CREATE);
+ }
+ $this->showFormHeader();
+ echo "
";
+ echo "| " . __('Language') . " : | ";
+ echo "";
+ echo "";
+ echo "";
+ if ($id > 0) {
+ echo Dropdown::getLanguageName($this->fields['language']);
+ } else {
+ Dropdown::showLanguages(
+ "language",
+ ['display_none' => false,
+ 'value' => $_SESSION['glpilanguage'],
+ 'used' => self::getAlreadyTranslatedForItem(
+ $itemtype,
+ $items_id
+ )
+ ]
+ );
+ }
+ echo " | |
";
+
+ echo "
";
+ echo " | ";
+ echo "";
+ echo Html::input('label', [
+ 'value' => $this->fields["label"],
+ 'id' => 'label'
+ ]);
+ echo " |
";
+
+ $this->showFormButtons();
+ return true;
+ }
+
+ /**
+ * Get already translated languages for item
+ *
+ * @param string $itemtype Item type
+ * @param int $items_id Item ID
+ *
+ * @return array of already translated languages
*/
- function showFormForItem($itemtype, $items_id, $id = -1) {
- if ($id > 0) {
- $this->check($id, READ);
- } else {
- // Create item
- $this->check(-1, CREATE);
-
- }
- $this->showFormHeader();
- echo "
";
- echo "| ".__('Language')." : | ";
- echo "";
- echo "";
- echo "";
- if ($id > 0) {
- echo Dropdown::getLanguageName($this->fields['language']);
- } else {
- Dropdown::showLanguages("language",
- ['display_none' => false,
- 'value' => $_SESSION['glpilanguage'],
- 'used' => self::getAlreadyTranslatedForItem($itemtype, $items_id)]);
- }
- echo " | |
";
-
- echo "
";
- echo " | ";
- echo "";
- echo Html::input('label', [
- 'value' => $this->fields["label"],
- 'id' => 'label'
- ]);
- echo " |
";
-
- $this->showFormButtons();
- return true;
- }
-
- /**
- * Get already translated languages for item
- *
- * @param string $itemtype Item type
- * @param int $items_id Item ID
- *
- * @return array of already translated languages
- **/
- static function getAlreadyTranslatedForItem($itemtype, $items_id) {
- global $DB;
-
- $iterator = $DB->request(
- [
- 'FROM' => self::getTable(),
- 'WHERE' => [
- 'itemtype' => $itemtype,
- 'items_id' => $items_id,
+ public static function getAlreadyTranslatedForItem($itemtype, $items_id)
+ {
+ global $DB;
+
+ $iterator = $DB->request(
+ [
+ 'FROM' => self::getTable(),
+ 'WHERE' => [
+ 'itemtype' => $itemtype,
+ 'items_id' => $items_id,
+ ]
]
- ]
- );
- $tab = [];
- foreach ($iterator as $data) {
- $tab[$data['language']] = $data['language'];
- }
- return $tab;
- }
-
- /**
- * Get trnaslated label for item
- *
- * @param array $item Item
- *
- * @return string
- */
- static public function getLabelFor(array $item) {
- $obj = new self;
- $found = $obj->find(['itemtype' => $item['itemtype'],
- 'items_id' => $item['id'],
- 'language' => $_SESSION['glpilanguage']]);
-
- if (count($found) > 0) {
- return array_values($found)[0]['label'];
- }
-
- return $item['label'];
- }
+ );
+ $tab = [];
+ foreach ($iterator as $data) {
+ $tab[$data['language']] = $data['language'];
+ }
+ return $tab;
+ }
+
+ /**
+ * Get translated label for item
+ *
+ * @param array $item Item
+ *
+ * @return string
+ */
+ public static function getLabelFor(array $item)
+ {
+ $obj = new self();
+ $found = $obj->find(['itemtype' => $item['itemtype'],
+ 'items_id' => $item['id'],
+ 'language' => $_SESSION['glpilanguage']
+ ]);
+
+ if (count($found) > 0) {
+ return array_values($found)[0]['label'];
+ }
+
+ return $item['label'];
+ }
}
diff --git a/inc/menu.class.php b/inc/menu.class.php
index 2237c23d..2ccc125b 100644
--- a/inc/menu.class.php
+++ b/inc/menu.class.php
@@ -28,44 +28,43 @@
* -------------------------------------------------------------------------
*/
-class PluginFieldsMenu extends CommonGLPI {
- static $rightname = 'entity';
+class PluginFieldsMenu extends CommonGLPI
+{
+ public static $rightname = 'entity';
- static function getMenuName() {
- return __("Additionnal fields", "fields");
- }
+ public static function getMenuName()
+ {
+ return __("Additionnal fields", "fields");
+ }
- static function getMenuContent() {
+ public static function getMenuContent()
+ {
+ if (!Session::haveRight('entity', READ)) {
+ return;
+ }
- if (!Session::haveRight('entity', READ)) {
- return;
- }
+ $front_fields = Plugin::getPhpDir('fields', false) . "/front";
+ $menu = [
+ 'title' => self::getMenuName(),
+ 'page' => "$front_fields/container.php",
+ 'icon' => PluginFieldsContainer::getIcon(),
+ ];
- $front_fields = Plugin::getPhpDir('fields', false)."/front";
- $menu = [
- 'title' => self::getMenuName(),
- 'page' => "$front_fields/container.php",
- 'icon' => PluginFieldsContainer::getIcon(),
- ];
+ $itemtypes = ['PluginFieldsContainer' => 'fieldscontainer'];
- $itemtypes = ['PluginFieldsContainer' => 'fieldscontainer'];
+ foreach ($itemtypes as $itemtype => $option) {
+ $menu['options'][$option] = [
+ 'title' => $itemtype::getTypeName(2),
+ 'page' => $itemtype::getSearchURL(false),
+ 'links' => [
+ 'search' => $itemtype::getSearchURL(false)
+ ]
+ ];
- foreach ($itemtypes as $itemtype => $option) {
- $menu['options'][$option] = [
- 'title' => $itemtype::getTypeName(2),
- 'page' => $itemtype::getSearchURL(false),
- 'links' => [
- 'search' => $itemtype::getSearchURL(false)
- ]
- ];
-
- if ($itemtype::canCreate()) {
- $menu['options'][$option]['links']['add'] = $itemtype::getFormURL(false);
- }
-
- }
- return $menu;
- }
-
-
-}
\ No newline at end of file
+ if ($itemtype::canCreate()) {
+ $menu['options'][$option]['links']['add'] = $itemtype::getFormURL(false);
+ }
+ }
+ return $menu;
+ }
+}
diff --git a/inc/migration.class.php b/inc/migration.class.php
index 7cdd145b..e4dd8ce8 100644
--- a/inc/migration.class.php
+++ b/inc/migration.class.php
@@ -28,56 +28,57 @@
* -------------------------------------------------------------------------
*/
-class PluginFieldsMigration extends Migration {
+class PluginFieldsMigration extends Migration
+{
+ public function displayMessage($msg)
+ {
+ Session::addMessageAfterRedirect($msg);
+ }
- function displayMessage($msg) {
- Session::addMessageAfterRedirect($msg);
- }
+ /**
+ * Return SQL fields corresponding to given additionnal field.
+ *
+ * @param string $field_name
+ * @param string $field_type
+ *
+ * @return array
+ */
+ public static function getSQLFields(string $field_name, string $field_type): array
+ {
+ $default_key_sign = DBConnection::getDefaultPrimaryKeySignOption();
- /**
- * Return SQL fields corresponding to given additionnal field.
- *
- * @param string $field_name
- * @param string $field_type
- *
- * @return array
- */
- public static function getSQLFields(string $field_name, string $field_type): array {
+ $fields = [];
+ switch (true) {
+ case $field_type === 'header':
+ // header type is for read-only display purpose only and has no SQL field
+ break;
+ case $field_type === 'dropdown':
+ case preg_match('/^dropdown-.+/i', $field_type):
+ if ($field_type === 'dropdown') {
+ $field_name = getForeignKeyFieldForItemType(PluginFieldsDropdown::getClassname($field_name));
+ }
+ $fields[$field_name] = "INT {$default_key_sign} NOT NULL DEFAULT 0";
+ break;
+ case $field_type === 'textarea':
+ case $field_type === 'url':
+ $fields[$field_name] = 'TEXT DEFAULT NULL';
+ break;
+ case $field_type === 'yesno':
+ $fields[$field_name] = 'INT NOT NULL DEFAULT 0';
+ break;
+ case $field_type === 'glpi_item':
+ $fields[sprintf('itemtype_%s', $field_name)] = 'varchar(100) NOT NULL';
+ $fields[sprintf('items_id_%s', $field_name)] = "int {$default_key_sign} NOT NULL DEFAULT 0";
+ break;
+ case $field_type === 'date':
+ case $field_type === 'datetime':
+ case $field_type === 'number':
+ case $field_type === 'text':
+ default:
+ $fields[$field_name] = 'VARCHAR(255) DEFAULT NULL';
+ break;
+ }
- $default_key_sign = DBConnection::getDefaultPrimaryKeySignOption();
-
- $fields = [];
- switch (true) {
- case $field_type === 'header':
- // header type is for read-only display purpose only and has no SQL field
- break;
- case $field_type === 'dropdown':
- case preg_match('/^dropdown-.+/i', $field_type):
- if ($field_type === 'dropdown') {
- $field_name = getForeignKeyFieldForItemType(PluginFieldsDropdown::getClassname($field_name));
- }
- $fields[$field_name] = "INT {$default_key_sign} NOT NULL DEFAULT 0";
- break;
- case $field_type === 'textarea':
- case $field_type === 'url':
- $fields[$field_name] = 'TEXT DEFAULT NULL';
- break;
- case $field_type === 'yesno':
- $fields[$field_name] = 'INT NOT NULL DEFAULT 0';
- break;
- case $field_type === 'glpi_item':
- $fields[sprintf('itemtype_%s', $field_name)] = 'varchar(100) NOT NULL';
- $fields[sprintf('items_id_%s', $field_name)] = "int {$default_key_sign} NOT NULL DEFAULT 0";
- break;
- case $field_type === 'date':
- case $field_type === 'datetime':
- case $field_type === 'number':
- case $field_type === 'text':
- default:
- $fields[$field_name] = 'VARCHAR(255) DEFAULT NULL';
- break;
- }
-
- return $fields;
- }
+ return $fields;
+ }
}
diff --git a/inc/profile.class.php b/inc/profile.class.php
index 25b66607..f56a73db 100644
--- a/inc/profile.class.php
+++ b/inc/profile.class.php
@@ -28,27 +28,29 @@
* -------------------------------------------------------------------------
*/
-class PluginFieldsProfile extends CommonDBRelation {
- use Glpi\Features\Clonable;
+class PluginFieldsProfile extends CommonDBRelation
+{
+ use Glpi\Features\Clonable;
- public static $itemtype_1 = PluginFieldsContainer::class;
- public static $items_id_1 = 'plugin_fields_containers_id';
- public static $itemtype_2 = Profile::class;
- public static $items_id_2 = 'profiles_id';
+ public static $itemtype_1 = PluginFieldsContainer::class;
+ public static $items_id_1 = 'plugin_fields_containers_id';
+ public static $itemtype_2 = Profile::class;
+ public static $items_id_2 = 'profiles_id';
- static function install(Migration $migration) {
- global $DB;
+ public static function install(Migration $migration)
+ {
+ global $DB;
- $default_charset = DBConnection::getDefaultCharset();
- $default_collation = DBConnection::getDefaultCollation();
- $default_key_sign = DBConnection::getDefaultPrimaryKeySignOption();
+ $default_charset = DBConnection::getDefaultCharset();
+ $default_collation = DBConnection::getDefaultCollation();
+ $default_key_sign = DBConnection::getDefaultPrimaryKeySignOption();
- $table = self::getTable();
+ $table = self::getTable();
- if (!$DB->tableExists($table)) {
- $migration->displayMessage(sprintf(__("Installing %s"), $table));
+ if (!$DB->tableExists($table)) {
+ $migration->displayMessage(sprintf(__("Installing %s"), $table));
- $query = "CREATE TABLE IF NOT EXISTS `$table` (
+ $query = "CREATE TABLE IF NOT EXISTS `$table` (
`id` INT {$default_key_sign} NOT NULL auto_increment,
`profiles_id` INT {$default_key_sign} NOT NULL DEFAULT '0',
`plugin_fields_containers_id` INT {$default_key_sign} NOT NULL DEFAULT '0',
@@ -57,128 +59,133 @@ static function install(Migration $migration) {
KEY `profiles_id` (`profiles_id`),
KEY `plugin_fields_containers_id` (`plugin_fields_containers_id`)
) ENGINE=InnoDB DEFAULT CHARSET={$default_charset} COLLATE={$default_collation} ROW_FORMAT=DYNAMIC;";
- $DB->query($query) or die ($DB->error());
- }
-
- return true;
- }
-
-
- static function uninstall() {
- global $DB;
-
- $DB->query("DROP TABLE IF EXISTS `".self::getTable()."`");
-
- return true;
- }
-
-
- function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
- return self::createTabEntry(_n("Profile", "Profiles", 2));
- }
-
-
- static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) {
- $profile = new Profile;
- $found_profiles = $profile->find();
-
- $fields_profile = new self;
- echo "
+ );
+
+ // Exclude dropdown that corresponds to itemtypes targetted by container.
+ // This will prevent issues with search options.
+ // FIXME: Fix search options handling and remove this limitation.
+ $itemtypes_to_exclude = !empty($container->fields['itemtypes'])
+ ? array_map(
+ function ($itemtype) {
+ return 'dropdown-' . $itemtype;
+ },
+ json_decode($container->fields['itemtypes'])
+ )
+ : [];
+ Dropdown::showFromArray(
+ 'type',
+ self::getTypes(false),
+ [
+ 'value' => $this->fields['type'],
+ 'on_change' => 'plugin_fields_change_field_type_' . $rand . '(this.value)',
+ 'used' => array_combine($itemtypes_to_exclude, $itemtypes_to_exclude),
+ ]
+ );
+ }
+ echo "
';
- }
- if (in_array($this->fields['type'], ['date', 'datetime'])) {
- echo "";
- }
- echo '