Merge branch 'develop' into staging

This commit is contained in:
Mathieu Magnin 2017-03-27 14:26:10 +02:00
commit 2995dfa88e
2 changed files with 13 additions and 1 deletions

View file

@ -6,7 +6,7 @@ class DemoController < ApplicationController
return redirect_to root_path if Rails.env.production?
smart_listing_create :procedures,
Procedure.where(archived: false, published: true),
Procedure.where(archived: false, published: true).order("id DESC"),
partial: "demo/list",
array: true
end

View file

@ -86,6 +86,18 @@
}
}
],
"champs_private": [
{
"value": null,
"type_de_champ": {
"id": 1,
"libelle": "Description privée",
"type_champ": "text",
"order_place": 0,
"description": "description privée"
}
}
],
"pieces_justificatives": [
{
"url": null,