Commit Graph

18 Commits

Author SHA1 Message Date
paolo 6b1968ae5b Codesniffer compliant: if, for and while 2016-05-20 13:04:25 +02:00
paolo 9168479912 - Moved class Studiengang to Studiengang2 to prevent class name conflicts
- Added a route rule to let to call Studiengang2 controller with the urn /api/v1/organisation/studiengang/
 - Moved Kontank controller to /api/v1/person
 - Kontakt controller has two method getKontakt and postKontakt
2016-05-10 15:30:00 +02:00
Paminger 4b9d5d273b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
2016-05-10 14:36:01 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
paolo 030fe2ba74 Merge origin/ci into ci
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
2016-05-04 15:34:00 +02:00
paolo 53eab958dd New structure for CI controllers and models 2016-05-04 15:19:11 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00
Paminger fc6e2de1c9 ACL-System 2016-05-02 16:07:25 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
paolo 4cc83999ed - Moved class APIv1_Controller from FHC_Controller.php to APIv1_Controller.php
- Moved class DB_Model from FHC_Model.php to DB_Model.php
- load method of class person (person.class.php) now is calling getPerson
  method of the class Person_model
- getAllForBewerbung method of class studiengang (studiengang.class.php) now is calling getAllForBewerbung
  method of the class Studiengang_model
- getStudienplaene method of class studienplan (studienplan.class.php) now is calling getStudienplaene
  method of the class Studienplan_model
2016-04-25 18:25:03 +02:00
paolo a3a9c42e99 - Renamed classes, methods and properties names in german
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
2016-04-25 15:57:52 +02:00
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +02:00
paolo f154e6dd5d Check permissions FIX 2016-04-22 16:43:01 +02:00
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +02:00
paolo 78e4c2900b Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
2016-04-20 17:57:55 +02:00
Paminger bcfae6b009 Shit 2016-04-07 15:17:26 +02:00
Paminger c124348484 Message 2016-04-05 09:36:24 +02:00
Paminger 0c3c47f848 BaseControllerConcept into config.php 2016-03-15 08:14:05 +01:00