Commit 8e5bf259 authored by Grégoire GRZECZKOWICZ's avatar Grégoire GRZECZKOWICZ

Merge branch 'develop' into 'master'

Résolution problèmes de classement des utilisateurs et des aliments

See merge request br/chocapix-client!13
parents 226e6bff eba45ed2
Pipeline #4663 passed with stage
in 12 minutes and 29 seconds
......@@ -168,6 +168,9 @@ angular.module('bars.api.food', [
}],
sellitem_list: ['api.models.sellitem', function(SellItem) {
return SellItem.all();
}],
best_ever: ['food_item', function (food_item) {
return food_item.ranking({});
}]
},
views: {
......@@ -184,17 +187,12 @@ angular.module('bars.api.food', [
controller: 'api.ctrl.food_details.stocks',
},
'graphs@bar.food.details': {
templateUrl: "components/API/food/views/details-graphs.html",
controller: 'api.ctrl.food_details.graphs',
templateUrl: "components/API/food/views/details-graphs.html",
controller: 'api.ctrl.food_details.graphs'
},
'ranking@bar.food.details': {
templateUrl: "components/API/food/views/details-ranking.html",
controller: 'api.ctrl.food_details.ranking',
resolve: {
best_ever: ['food_item', function (food_item) {
return food_item.ranking({});
}]
}
controller: 'api.ctrl.food_details.ranking'
},
'edit@bar.food.details': {
templateUrl: "components/API/food/views/details-edit.html",
......
This diff is collapsed.
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