Improve query for PM groups, deleting lang criterion

Added samples folder
This commit is contained in:
tomolimo
2017-05-09 13:58:44 +02:00
parent a499665e77
commit 468338ba90
3 changed files with 2987 additions and 2 deletions

View File

@@ -291,7 +291,7 @@ class PluginProcessmakerConfig extends CommonDBTM {
echo "<td >".$LANG['processmaker']['config']['pm_group_name']."</td><td >";
$pmGroups = array( 0 => Dropdown::EMPTY_VALUE );
$query = "SELECT DISTINCT CON_ID, CON_VALUE FROM CONTENT WHERE CON_CATEGORY='GRP_TITLE' AND CON_LANG='".$pm->lang."' ORDER BY CON_VALUE;";
$query = "SELECT DISTINCT CON_ID, CON_VALUE FROM CONTENT WHERE CON_CATEGORY='GRP_TITLE' ORDER BY CON_VALUE;";
if ($PM_DB->connected) {
foreach ($PM_DB->request( $query ) as $row) {
$pmGroups[ $row['CON_ID'] ] = $row['CON_VALUE'];

View File

@@ -67,7 +67,7 @@ class PluginProcessmakerProcess extends CommonDBTM {
$mapLangs[ locale_get_primary_language( $key ) ][] = $key;
}
}
$lang = locale_get_primary_language( $CFG_GLPI['language'] );
$lang = locale_get_primary_language( $CFG_GLPI['language'] );
$query = "SELECT TASK.TAS_UID, TASK.TAS_START, CONTENT.CON_LANG, CONTENT.CON_CATEGORY, CONTENT.CON_VALUE FROM TASK
INNER JOIN CONTENT ON CONTENT.CON_ID=TASK.TAS_UID
WHERE TASK.PRO_UID = '".$this->fields['process_guid']."' AND CONTENT.CON_CATEGORY IN ('TAS_TITLE', 'TAS_DESCRIPTION') ".($translates ? "" : " AND CONTENT.CON_LANG='$lang'")." ;";

File diff suppressed because one or more lines are too long