Skip to content

Commit 608276e

Browse files
author
micker
committed
mistake
1 parent b5f866b commit 608276e

5 files changed

Lines changed: 24 additions & 13 deletions

File tree

‎assets/css/style.css‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ margin-left: -1px !important;
1212
color:#000;
1313
font-weight:bold;
1414
}
15+
.pending.well.well-small.span12 {
16+
margin-left: 0;
17+
}
1518
.revised.well.well-small.span12 {
1619
margin-left: 0;
1720
}
@@ -22,7 +25,7 @@ margin-left: -1px !important;
2225
margin-left: 0;
2326
}
2427
.inprogress.well.well-small.span12 {
25-
margin-left: 0px;
28+
margin-left: 0;
2629
}
2730
.inprogress.well.well-small.span6 {
2831
margin-left: 0;

‎helper.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static function getCustomlist1(&$params)
108108
{
109109
// recupere la connexion à la BD
110110
$db = JFactory::getDbo();
111-
$queryCustomlist = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist1').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
111+
$queryCustomlist = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist1').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
112112
$db->setQuery( $queryCustomlist );
113113
$itemsCustomlist = $db->loadObjectList();
114114
//print_r ($itemsCustomlist) ;
@@ -121,7 +121,7 @@ public static function getCustomlist2(&$params)
121121
{
122122
// recupere la connexion à la BD
123123
$db = JFactory::getDbo();
124-
$queryCustomlist2 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist2').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
124+
$queryCustomlist2 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist2').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
125125
$db->setQuery( $queryCustomlist2 );
126126
$itemsCustomlist2 = $db->loadObjectList();
127127
foreach ($itemsCustomlist2 as &$itemCustomlist2) {
@@ -133,7 +133,7 @@ public static function getCustomlist3(&$params)
133133
{
134134
// recupere la connexion à la BD
135135
$db = JFactory::getDbo();
136-
$queryCustomlist3 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist3').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
136+
$queryCustomlist3 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist3').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
137137
$db->setQuery( $queryCustomlist3 );
138138
$itemsCustomlist3 = $db->loadObjectList();
139139
foreach ($itemsCustomlist3 as &$itemCustomlist3) {
@@ -145,7 +145,7 @@ public static function getCustomlist4(&$params)
145145
{
146146
// recupere la connexion à la BD
147147
$db = JFactory::getDbo();
148-
$queryCustomlist4 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist4').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
148+
$queryCustomlist4 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist4').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
149149
$db->setQuery( $queryCustomlist4 );
150150
$itemsCustomlist4 = $db->loadObjectList();
151151
foreach ($itemsCustomlist4 as &$itemCustomlist4) {
@@ -157,7 +157,7 @@ public static function getCustomlist5(&$params)
157157
{
158158
// recupere la connexion à la BD
159159
$db = JFactory::getDbo();
160-
$queryCustomlist5 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist5').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
160+
$queryCustomlist5 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist5').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
161161
$db->setQuery( $queryCustomlist5 );
162162
$itemsCustomlist5 = $db->loadObjectList();
163163
foreach ($itemsCustomlist5 as &$itemCustomlist5) {
@@ -169,7 +169,7 @@ public static function getCustomlist6(&$params)
169169
{
170170
// recupere la connexion à la BD
171171
$db = JFactory::getDbo();
172-
$queryCustomlist6 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist6').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
172+
$queryCustomlist6 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist6').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
173173
$db->setQuery( $queryCustomlist6 );
174174
$itemsCustomlist6 = $db->loadObjectList();
175175
foreach ($itemsCustomlist6 as &$itemCustomlist6) {
@@ -181,7 +181,7 @@ public static function getCustomlist7(&$params)
181181
{
182182
// recupere la connexion à la BD
183183
$db = JFactory::getDbo();
184-
$queryCustomlist7 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist7').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
184+
$queryCustomlist7 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist7').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
185185
$db->setQuery( $queryCustomlist7 );
186186
$itemsCustomlist7 = $db->loadObjectList();
187187
foreach ($itemsCustomlist7 as &$itemCustomlist7) {
@@ -193,7 +193,7 @@ public static function getCustomlist8(&$params)
193193
{
194194
// recupere la connexion à la BD
195195
$db = JFactory::getDbo();
196-
$queryCustomlist8 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist8').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
196+
$queryCustomlist8 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist8').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
197197
$db->setQuery( $queryCustomlist8 );
198198
$itemsCustomlist8 = $db->loadObjectList();
199199
foreach ($itemsCustomlist8 as &$itemCustomlist8) {
@@ -205,7 +205,7 @@ public static function getCustomlist9(&$params)
205205
{
206206
// recupere la connexion à la BD
207207
$db = JFactory::getDbo();
208-
$queryCustomlist9 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist9').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
208+
$queryCustomlist9 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.id WHERE catid='.(int) $params->get('catidlist9').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
209209
$db->setQuery( $queryCustomlist9 );
210210
$itemsCustomlist9 = $db->loadObjectList();
211211
foreach ($itemsCustomlist9 as &$itemCustomlist9) {
@@ -217,7 +217,7 @@ public static function getCustomlist10(&$params)
217217
{
218218
// recupere la connexion à la BD
219219
$db = JFactory::getDbo();
220-
$queryCustomlist10 = 'SELECT id, title, catid, created, created_by, modified, modified_by FROM #__content WHERE catid='.(int) $params->get('catidlist10').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
220+
$queryCustomlist10 = 'SELECT a.id,b.name, a.title, a.catid, a.created, a.created_by, a.modified, a.modified_by FROM #__content AS a LEFT JOIN #__users AS b ON a.created_by = b.idt WHERE catid='.(int) $params->get('catidlist10').' AND state = 1 ORDER BY modified DESC LIMIT '. (int) $params->get('count');
221221
$db->setQuery( $queryCustomlist10 );
222222
$itemsCustomlist10 = $db->loadObjectList();
223223
foreach ($itemsCustomlist10 as &$itemCustomlist10) {

‎language/en-GB/en-GB.mod_flexiadmin.ini‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@ FLEXI_IN_PROGRESS="in progress"
181181
FLEXI_PUBLISHED="published"
182182
FLEXI_ADMIN_CREATED_BY="Created by"
183183
FLEXI_ADMIN_MODIFIED_BY="Modified by"
184+
FLEXI_UNPUBLISHED="unpublished"
185+
FLEXI_ARCHIVED="archived"
186+
FLEXI_PENDING="pending"
187+
FLEXI_DRAFT="draft"
184188

185189

186190

‎language/fr-FR/fr-FR.mod_flexiadmin.ini‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,8 @@ FLEXI_ADMIN_TRASHED="Article dans la corbeille"
183183
FLEXI_IN_PROGRESS="En cours"
184184
FLEXI_PUBLISHED="Publier"
185185
FLEXI_ADMIN_CREATED_BY="Créer par"
186-
FLEXI_ADMIN_MODIFIED_BY="Modifier par"
186+
FLEXI_ADMIN_MODIFIED_BY="Modifier par"
187+
FLEXI_UNPUBLISHED="dépublier"
188+
FLEXI_ARCHIVED="archiver"
189+
FLEXI_PENDING="en attente"
190+
FLEXI_DRAFT="brouillon"

‎tmpl/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ class="modal"
11561156
<span class="small">
11571157
<i class="icon-user"></i>
11581158
<?php //TODO display user name in tooltip ?>
1159-
<small class="hasTooltip" title="" data-original-title="<?php echo JHtml::tooltipText('FLEXI_ADMIN_MODIFIED_BY')." ". $itemCustomlist10->modified_by; ?>"><?php echo $itemCustomlist10->modified_by;?> </small>
1159+
<small class="hasTooltip" title="" data-original-title="<?php echo JHtml::tooltipText('FLEXI_ADMIN_MODIFIED_BY')." ". $itemCustomlist10->name; ?>"><?php echo $itemCustomlist10->name;?> </small>
11601160
</span>
11611161
</div>
11621162
<div class="span3">

0 commit comments

Comments
 (0)