Commit 3f466c92 authored by Anthony Geourjon's avatar Anthony Geourjon
Browse files

Merge branch 'EDCAMPUS-30-affichage-de-la-liste-des-projets' into 'master'

affichage_des_projets_dans_admin

See merge request !20
parents 7bc5455e 85502be4
......@@ -11,7 +11,7 @@ root.controller('AdminProjectsCtrl' ,['$scope','$universityFactory','$stateParam
var _init = function(){
$universityFactory.getMainUniversityByUser(null,function(univ){
$universityFactory.getMainUniversityByUser(session.user,function(univ){
prjCtrl.currentCampus = univ;
......
......@@ -85,7 +85,7 @@ function $universityFactory($rootScope,$serverFactory,$rightFactory) {
}
returns.get_campusProjects = function(univId,user,success,failure){
if(univId) return $serverFactory.runCommand("get_university_projects", {univId:univId,type:"project"},success,failure);
if(univId) return $serverFactory.runCommand("get_university_projects", {univId:univId,type:""},success,failure);
if(!user) user = $rootScope._getSession().user;
returns.get_userMainCampus(user,function(data){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment