From e4738f966d7fd8cf68d6c3d8c9453af2f18e7a7f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 29 Jul 2015 20:13:06 +0200
Subject: [PATCH] Controllers: no forward, web2 broke it again

---
 application/controllers/DatafieldController.php     | 4 ++--
 application/controllers/DatalistController.php      | 4 ++--
 application/controllers/DatalistentryController.php | 6 +++---
 application/controllers/ImportsourceController.php  | 4 ++--
 application/controllers/SyncpropertyController.php  | 4 ++--
 application/controllers/SyncruleController.php      | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/DatafieldController.php b/application/controllers/DatafieldController.php
index a15686cd..35005279 100644
--- a/application/controllers/DatafieldController.php
+++ b/application/controllers/DatafieldController.php
@@ -6,12 +6,12 @@ class Director_DatafieldController extends ActionController
 {
     public function addAction()
     {
-        $this->forward('index', 'datafield', 'director');
+        $this->indexAction();
     }
 
     public function editAction()
     {
-        $this->forward('index', 'datafield', 'director');
+        $this->indexAction();
     }
 
     public function indexAction()
diff --git a/application/controllers/DatalistController.php b/application/controllers/DatalistController.php
index 469ea31d..7b47d41f 100644
--- a/application/controllers/DatalistController.php
+++ b/application/controllers/DatalistController.php
@@ -6,12 +6,12 @@ class Director_DatalistController extends ActionController
 {
     public function addAction()
     {
-        $this->forward('index', 'datalist', 'director');
+        $this->indexAction();
     }
 
     public function editAction()
     {
-        $this->forward('index', 'datalist', 'director');
+        $this->indexAction();
     }
 
     public function indexAction()
diff --git a/application/controllers/DatalistentryController.php b/application/controllers/DatalistentryController.php
index 7c4c72b0..5d040f8f 100644
--- a/application/controllers/DatalistentryController.php
+++ b/application/controllers/DatalistentryController.php
@@ -6,15 +6,15 @@ class Director_DatalistentryController extends ActionController
 {
     public function addAction()
     {
-        $this->forward('index', 'datalistentry', 'director');
+        $this->indexAction();
     }
 
     public function editAction()
     {
-        $this->forward('index', 'datalistentry', 'director', array('edit' => true));
+        $this->indexAction();
     }
 
-    public function indexAction()
+    public function indexAction($edit = false)
     {
         $request = $this->getRequest();
 
diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php
index 6197beac..653fc6a1 100644
--- a/application/controllers/ImportsourceController.php
+++ b/application/controllers/ImportsourceController.php
@@ -11,12 +11,12 @@ class Director_ImportsourceController extends ActionController
 {
     public function addAction()
     {
-        $this->forward('index', 'importsource', 'director');
+        $this->indexAction();
     }
 
     public function editAction()
     {
-        $this->forward('index', 'importsource', 'director');
+        $this->indexAction();
     }
 
     public function runAction()
diff --git a/application/controllers/SyncpropertyController.php b/application/controllers/SyncpropertyController.php
index be65118c..cce42766 100644
--- a/application/controllers/SyncpropertyController.php
+++ b/application/controllers/SyncpropertyController.php
@@ -10,12 +10,12 @@ class Director_SyncpropertyController extends ActionController
 {
     public function addAction()
     {
-        $this->forward('index', 'syncproperty', 'director');
+        $this->indexAction();
     }
 
     public function editAction()
     {
-        $this->forward('index', 'syncproperty', 'director');
+        $this->indexAction();
     }
 
     public function runAction()
diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php
index 24434388..dc843f71 100644
--- a/application/controllers/SyncruleController.php
+++ b/application/controllers/SyncruleController.php
@@ -10,12 +10,12 @@ class Director_SyncruleController extends ActionController
 {
     public function addAction()
     {
-        $this->forward('index', 'syncrule', 'director');
+        $this->indexAction();
     }
 
     public function editAction()
     {
-        $this->forward('index', 'syncrule', 'director');
+        $this->indexAction();
     }
 
     public function runAction()