Commit e48aae07 authored by Nezael's avatar Nezael
Browse files

Merge branch 'paperboard' into 189-ajouter-le-dessin-a-main-leve

parents 8d45321a 7a7ec865
<button class="pull-right"
ng-click="leaveBoard()"
ui-sref="project.workshops.overview">{{::_labels.disconnectWorkshopBtn}}
</button>
<div class="clearfix group-overview">
<div class="group-overview-title">
<h4 style="text-align: center"><span ng-bind="::_labels.workshops"></span></h4>
......@@ -21,4 +27,4 @@
</label>
</div>
</div>
</div>
\ No newline at end of file
</div>
/*
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
......@@ -14,23 +14,28 @@ root.controller('DetailsPaperBoardCtrl', ['$scope', '$stateParams', '$http', '$s
if (!paperBoardDetails) var paperBoardDetails = {"id": $stateParams.elementId};
$scope._showAlert({status: 2, message: $languageFactory._labels.alerts_loadingpaperBoardDetails});
$paperboardFactory.getPaperBoardDetails($scope._getProject(), paperBoardDetails.id, function (data)
$paperboardFactory.getPaperBoardDetails($scope._getProject(), paperBoardDetails.id, function (data)
{
if (data.status == "success")
if (data.status == "success")
{
var paperboard = data.details[0];
detailsPaperBoardCtrl.paperboard = JSON.parse(paperboard.params);
detailsPaperBoardCtrl.paperboard.id = paperboard.id;
detailsPaperBoardCtrl.paperboard.type = 1;
$scope._showAlert({status: 1, message: $languageFactory._labels.alerts_loadingpaperBoardDetailsSuccess});
}
else
}
else
{
$scope._showAlert({status: 3, message: $languageFactory._labels.alerts_loadingpaperBoardDetailsFailure});
}
});
}
$scope.leaveBoard = function(){
alert("Vous venez de quitter l'atelier");
}
detailsPaperBoardCtrl.getPaperBoardDetails();
}]);
\ No newline at end of file
}]);
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