Merge origin/ci into ci

Conflicts: application/controllers/api/v1/crm/Prestudentstatus.php
2026-07-23 18:02:18 +00:00 · 2016-05-24 12:32:32 +02:00
parent bb3f8ef617 58e9eb37a2
commit 4f8826dc3f
8 changed files with 79 additions and 10 deletions
@@ -70,6 +70,13 @@ class Orgform extends APIv1_Controller
 			$this->response();
 		}
 	}
+        
+        public function getAll()
+	{
+		$result = $this->OrgformModel->loadWhole();
+		
+		$this->response($result, REST_Controller::HTTP_OK);
+	}
 	
 	private function _validate($orgform = NULL)
 	{
@@ -86,4 +86,4 @@ class Prestudentstatus extends APIv1_Controller
 	{
 		return true;
 	}
-}
+}