Commit 358a17bf authored by Anthony Geourjon's avatar Anthony Geourjon
Browse files

Merge branch 'EDCAMPUS-29-import-csv-inscription-dans-les-projets' into 'master'

Edcampus 29 import csv inscription dans les projets

See merge request !22
parents 2d4b675f 6b92b2e3
......@@ -75,7 +75,7 @@ root.controller('AdminGroupsCtrl' ,['$scope','$http','$universityFactory','$user
var refresh = function(){
$usersGroupFactory.get_group_byCampus(AdminGrpCtrl.currentCampus.id,function(data){
$usersGroupFactory.get_group_byCampus(AdminGrpCtrl.currentCampus.id, null, function(data){
if(data.status=="success") AdminGrpCtrl.groupList = data.details;
},function(error){
......@@ -83,7 +83,8 @@ root.controller('AdminGroupsCtrl' ,['$scope','$http','$universityFactory','$user
})
}
var _init = function(){
$universityFactory.getMainUniversityByUser(null,function(univ){
var session = $scope._getSession();
$universityFactory.getMainUniversityByUser(session.user,function(univ){
AdminGrpCtrl.currentCampus = univ;
refresh();
......
......@@ -287,7 +287,7 @@ function $fileFactory($rootScope,$serverFactory,$window, $languageFactory, $filt
* @return {[array]} [all datas to insert]
*/
returns.post_file_uploadUserFile = function(projectId, name, type, size, file, success,failure){
return $serverFactory.runCommand("post_file_data", {projectId:projectId,name:name, type:type, size:size, file:file},success,failure);
return $serverFactory.runCommand("post_file_data", {projectId:projectId,name:name, type:type, file:file, size:size},success,failure);
}
......
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