Download as
Browse Code »

Commit d462942c4c0eea2a276b4a818b49551ce694e333

Authored by Fellipe
2 parents 06dea9ef 218a75a3
Exists in master and in 2 other branches 3,1, 3.1

resolve conflito

Showing 4 changed files with 9 additions and 0 deletions   Show diff stats
Controller/CircuitsController.php
  Diff comments   View file @d462942
... ... @@ -50,6 +50,7 @@ class CircuitsController extends Controller
50 50 {
51 51 $entity = new Circuits();
52 52 $form = $this->createForm(new CircuitsType(), $entity);
  53 +
53 54 $form->bind($request);
54 55  
55 56 if ($form->isValid()) {
... ... @@ -155,6 +156,7 @@ class CircuitsController extends Controller
155 156  
156 157 $deleteForm = $this->createDeleteForm($id);
157 158 $editForm = $this->createForm(new CircuitsType(), $entity);
  159 +
158 160 $editForm->bind($request);
159 161  
160 162 if ($editForm->isValid()) {
... ... @@ -179,6 +181,7 @@ class CircuitsController extends Controller
179 181 public function deleteAction(Request $request, $id)
180 182 {
181 183 $form = $this->createDeleteForm($id);
  184 +
182 185 $form->bind($request);
183 186  
184 187 if ($form->isValid()) {
... ...
Controller/EntityController.php
  Diff comments   View file @d462942
... ... @@ -47,6 +47,7 @@ class EntityController extends Controller
47 47 {
48 48 $entity = new Entity();
49 49 $form = $this->createForm(new EntityType(), $entity);
  50 +
50 51 $form->bind($request);
51 52  
52 53 if ($form->isValid()) {
... ... @@ -152,6 +153,7 @@ class EntityController extends Controller
152 153  
153 154 $deleteForm = $this->createDeleteForm($id);
154 155 $editForm = $this->createForm(new EntityType(), $entity);
  156 +
155 157 $editForm->bind($request);
156 158  
157 159 if ($editForm->isValid()) {
... ... @@ -176,6 +178,7 @@ class EntityController extends Controller
176 178 public function deleteAction(Request $request, $id)
177 179 {
178 180 $form = $this->createDeleteForm($id);
  181 +
179 182 $form->bind($request);
180 183  
181 184 if ($form->isValid()) {
... ...
Controller/GraphController.php
  Diff comments   View file @d462942
... ... @@ -39,6 +39,7 @@ class GraphController extends Controller
39 39 public function graphShowAction(Request $request, $id)
40 40 {
41 41 $form = $this->graphForm();
  42 +
42 43 $form->bind($request);
43 44  
44 45 if ($form->isValid())
... ... @@ -842,6 +843,7 @@ class GraphController extends Controller
842 843 public function reportShowAction(Request $request)
843 844 {
844 845 $form = $this->reportForm($request->request->get('entity'));
  846 +
845 847 $form->bind($request);
846 848  
847 849 if ($form->isValid())
... ...
Controller/SnmpWebController.php
  Diff comments   View file @d462942
... ... @@ -22,6 +22,7 @@ class SnmpWebController extends Controller
22 22 public function snmpInfoAction(Request $request)
23 23 {
24 24 $form = $this->snmpForm();
  25 +
25 26 $form->bind($request);
26 27  
27 28 if ($form->isValid())
... ...