franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

table name in uppercase in profile

Browse Source
This commit is contained in:
lutranf
2014-09-10 18:06:56 +02:00
parent 8f1a42b23e
commit ed6275164e
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
inc/databap.php
View File

@@ -989,6 +989,7 @@ class Databap extends PhpObject
if($bSuccess) if($bSuccess)
{ {
$asTable['date'] = self::getDateFormat($asTable['timestamp'], self::DATE_FORMAT); $asTable['date'] = self::getDateFormat($asTable['timestamp'], self::DATE_FORMAT);
$asTable['title'] = $asTable['table_name'];
unset($asTable['timestamp']); unset($asTable['timestamp']);
$asTable['id'] = $asTable[MySqlManager::getId(self::TABL_TABLE)]; $asTable['id'] = $asTable[MySqlManager::getId(self::TABL_TABLE)];
@@ -1157,6 +1158,7 @@ class Databap extends PhpObject
{ {
$asTable['system'] = self::getTableFormat($asTable['system']); $asTable['system'] = self::getTableFormat($asTable['system']);
$asTable['description'] = self::getDescriptionFormat($asTable['description']); $asTable['description'] = self::getDescriptionFormat($asTable['description']);
$asTable['table_name'] = self::getTableFormat($asTable['title']);
$asTable['title'] = self::getTableFormat($asTable['title']).' - '.$asTable['description']; $asTable['title'] = self::getTableFormat($asTable['title']).' - '.$asTable['description'];
$asTable['led'] = self::getDateFormat($asTable['led']); $asTable['led'] = self::getDateFormat($asTable['led']);
$asTable['formated_keywords'] = ToolBox::formatText($asTable['keywords']); $asTable['formated_keywords'] = ToolBox::formatText($asTable['keywords']);
@@ -1379,27 +1381,25 @@ class Databap extends PhpObject
//History Info //History Info
$asTables = $this->getTypeInfo('table'); $asTables = $this->getTypeInfo('table');
unset($asTables[self::ART_TYPE]); //Skip articles
foreach($asTables as $sType=>$sTableName) foreach($asTables as $sType=>$sTableName)
{ {
//Skip articles
if($sTableName==self::ART_TABLE) continue;
//Add Text //Add Text
$sText = mb_strtolower($this->getPageTitles($this->getPagesFromHash($sType))); $sText = mb_strtolower($this->getPageTitles($this->getPagesFromHash($sType)));
if(!$sText) $this->addError('Pas de texte pour le type "'.$sType.'"'); if(!$sText) $this->addError('Pas de texte pour le type "'.$sType.'"');
//Loop through items //Loop through items
$asSqlInfo = array('from'=>$sTableName, 'constraint'=>array(MySqlManager::getId(self::USER_TABLE)=>$iUserId)); $asSqlInfo = array('select'=>MySqlManager::getId($sTableName), 'from'=>$sTableName, 'constraint'=>array(MySqlManager::getId(self::USER_TABLE)=>$iUserId));
$asHistory = $this->oMySql->selectRows($asSqlInfo); $asHistory = $this->oMySql->selectRows($asSqlInfo);
foreach($asHistory as $asInfo) foreach($asHistory as $iItemId)
{ {
$sLed = $asInfo['led']; $asInfo = $this->getItemInfo($sType, $iItemId);
$iItemId = $asInfo[MySqlManager::getId($sTableName)]; $sKey = $asInfo['timestamp'].$sType.$iItemId;
$asProfile['history'][$sLed]['type'] = $sType; $asProfile['history'][$sKey]['type'] = $sType;
$asProfile['history'][$sLed]['id'] = $iItemId; $asProfile['history'][$sKey]['id'] = $iItemId;
$asProfile['history'][$sLed]['action'] = (($asInfo['refer_id']==$iItemId)?'Création':'Modification').' de '.$sText; $asProfile['history'][$sKey]['action'] = (($asInfo['refer_id']==$iItemId)?'Création':'Modification').' de '.$sText;
$asProfile['history'][$sLed]['date'] = self::getDateFormat($sLed); $asProfile['history'][$sKey]['date'] = $asInfo['led'];
$asProfile['history'][$sLed]['title'] = array_key_exists('title', $asInfo)?$asInfo['title']:$asInfo['description']; $asProfile['history'][$sKey]['title'] = $asInfo['title'];
} }
} }

1
todo
View File

@@ -9,7 +9,6 @@ Internal:
Bug fix: Bug fix:
- [1.0.0] Recherche : conflit entre "rank" et author / date - [1.0.0] Recherche : conflit entre "rank" et author / date
- [1.0.0] nom de la table en majuscule dans le profil
- [1.0.0] Tab dans chat - [1.0.0] Tab dans chat
- [1.0.1] Check le document type plutot que l'extension pour les /img - [1.0.1] Check le document type plutot que l'extension pour les /img
- [1.0.1] Resize .gif - [1.0.1] Resize .gif