Merge branch 'issue#154' into 'dev'

Merge branch issue#154 with dev

See merge request !90

ui/nG6/pi1/class.tx_nG6_pi1.php

@@ -154,9 +154,11 @@ class tx_nG6_pi1 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 		} else {
 			if( $is_current_user_superadmin ){
 				$projects = tx_nG6_db::select_superadmin_projects();
+				$visible_projects = NULL;
 			}else{
 				$projects = tx_nG6_db::select_all_user_projects($user_id, 'tx_nG6_project.uid DESC');
 				//$projects = tx_nG6_db::select_all_user_projects($user_id, 'tx_nG6_project.name');
+				$visible_projects = tx_nG6_db::get_user_projects($user_id);
 			}
 			
 		}
@@ -201,6 +203,7 @@ class tx_nG6_pi1 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 			$smarty->assign('single_project_display', $single_project_display);
 			$smarty->assign('is_ng6_admin', tx_nG6_db::is_ng6_administrator($user_id) || tx_nG6_db::is_user_ng6_superadmin($user_id) ? true : false);
 			$smarty->assign('is_ng6_superadmin', tx_nG6_db::is_user_ng6_superadmin($user_id) ? true : false);
+			$smarty->assign('visible_projects', $visible_projects);
 			
 			// If it's a single project, add runs and analysis information
 			if ($single_project_display) {

ui/nG6/pi1/project_view.tpl

@@ -301,7 +301,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			
 		</div>
 		<div class="ng6-content-header-right">
-			You have access to <strong>{$projects|@count}</strong> projects.
+			{if $is_ng6_superadmin}
+				You have access to <strong>{$projects|@count}</strong> projects.
+			{else}
+				You have access to <strong>{$visible_projects|@count}</strong> projects.
+			{/if}
+
 			<br />
 	    	{assign var="project_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
 			Raw data and analysis results use <strong>{$project_size}</strong> on the hard drive for all projects.