Cleanup and small fixes

WebTolk · May 14, 2019 · 47ed5ad · 47ed5ad
1 parent 9901644
commit 47ed5ad
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/com_swjprojects/admin/models/categories.php b/com_swjprojects/admin/models/categories.php
@@ -43,6 +43,7 @@ public function __construct($config = array())
 				'id', 'c.id',
 				'title', 'c.title',
 				'published', 'state', 'c.state',
+				'ordering', 'lft', 'c.lft',
 			);
 		}
 

diff --git a/com_swjprojects/admin/models/projects.php b/com_swjprojects/admin/models/projects.php
@@ -46,6 +46,7 @@ public function __construct($config = array())
 				'category', 'category_id', 'c.id', 'e.catid', 'catid', 'category_title', 'cl.title',
 				'downloads', 'p.downloads',
 				'hits', 'p.hits',
+				'ordering', 'p.ordering',
 			);
 		}
 		parent::__construct($config);

diff --git a/com_swjprojects/admin/views/categories/view.html.php b/com_swjprojects/admin/views/categories/view.html.php
@@ -185,7 +185,8 @@ protected function getSortFields()
 		return [
 			'с.state' => Text::_('JSTATUS'),
 			'с.id'    => Text::_('JGRID_HEADING_ID'),
-			'с.title' => Text::_('JGLOBAL_TITLE')
+			'с.title' => Text::_('JGLOBAL_TITLE'),
+			'c.lft'   => Text::_('JGRID_HEADING_ORDERING')
 		];
 	}
 }
diff --git a/com_swjprojects/admin/views/projects/tmpl/default.php b/com_swjprojects/admin/views/projects/tmpl/default.php
@@ -77,7 +77,7 @@
 							$listDirn, $listOrder); ?>
 					</th>
 					<th width="1%" class="nowrap hidden-phone center">
-						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'c.id', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'p.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
 				</thead>

diff --git a/com_swjprojects/admin/views/projects/view.html.php b/com_swjprojects/admin/views/projects/view.html.php
@@ -173,7 +173,8 @@ protected function getSortFields()
 			'p.title'        => Text::_('JGLOBAL_TITLE'),
 			'category_title' => Text::_('COM_SWJPROJECTS_CATEGORY'),
 			'downloads'      => Text::_('COM_SWJPROJECTS_STATISTICS_DOWNLOADS'),
-			'p.hits'         => Text::_('COM_SWJPROJECTS_STATISTICS_HITS')
+			'p.hits'         => Text::_('COM_SWJPROJECTS_STATISTICS_HITS'),
+			'p.ordering'     => Text::_('JGRID_HEADING_ORDERING')
 		];
 	}
 }
diff --git a/com_swjprojects/site/views/project/view.html.php b/com_swjprojects/site/views/project/view.html.php
@@ -250,8 +250,7 @@ protected function _prepareDocument()
 		}
 
 		// Set meta robots
-		$inWork = $this->state->get('debug', 0);
-		if ($inWork)
+		if ($this->state->get('debug', 0))
 		{
 			$this->document->setMetadata('robots', 'noindex');
 		}

diff --git a/com_swjprojects/site/views/projects/view.html.php b/com_swjprojects/site/views/projects/view.html.php
@@ -224,8 +224,7 @@ protected function _prepareDocument()
 		}
 
 		// Set meta robots
-		$inWork = $this->state->get('debug', 0);
-		if ($inWork)
+		if ($this->state->get('debug', 0))
 		{
 			$this->document->setMetadata('robots', 'noindex');
 		}

diff --git a/com_swjprojects/site/views/version/view.html.php b/com_swjprojects/site/views/version/view.html.php
@@ -250,8 +250,7 @@ protected function _prepareDocument()
 		}
 
 		// Set meta robots
-		$inWork = $this->state->get('debug', 0);
-		if ($inWork)
+		if ($this->state->get('debug', 0))
 		{
 			$this->document->setMetadata('robots', 'noindex');
 		}

diff --git a/com_swjprojects/site/views/versions/view.html.php b/com_swjprojects/site/views/versions/view.html.php
@@ -257,8 +257,7 @@ protected function _prepareDocument()
 		}
 
 		// Set meta robots
-		$inWork = $this->state->get('debug', 0);
-		if ($inWork)
+		if ($this->state->get('debug', 0))
 		{
 			$this->document->setMetadata('robots', 'noindex');
 		}