Commit Graph

1586 Commits

Author SHA1 Message Date
paolo ba1c637ca4 Method getPhrases of library PhrasesLib now returns the text of a phrase
converted from textile to html
2016-07-06 16:07:17 +02:00
Stefan Puraner 325e7f49c6 fixed bug when index is missing in post data 2016-07-06 13:31:34 +02:00
paolo 925bb10efa Better error messages when sending a message with a template 2016-07-06 12:05:10 +02:00
Paminger c9e980c74a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-05 19:13:59 +02:00
Paminger d7801da391 Roles 2016-07-05 19:13:37 +02:00
Paminger 6a609283a4 Seeds and DBTools extension 2016-07-05 19:12:54 +02:00
paolo eac6aae4f1 MigrationLib has a better output for HTTP or CLI 2016-07-05 17:54:26 +02:00
paolo c85a406ec6 Merge origin/ci into ci 2016-07-05 16:25:24 +02:00
paolo 8e37e85ecc Because the column ort_kurzbz of the table tbl_rt_person is now optional,
the join with the table tbl_ort has been replaced with a left join
2016-07-05 16:24:46 +02:00
Stefan Puraner 1590fad8bb fixed bug 2016-07-05 15:36:00 +02:00
Gerry Raab 0c7df621a5 orgform widget + neues recht 2016-07-05 14:34:50 +02:00
oesi 65613d2869 tbl_rt_person ort_kurzbz is now optional 2016-07-05 14:20:52 +02:00
oesi 385e17eff7 Added Foreign Key for UID Column 2016-07-05 09:58:34 +02:00
Paminger cddfc142c7 Kosmetik 2016-07-05 07:11:46 +02:00
Gerry Raab a6c61d0bc1 phrases stuff 2016-07-05 00:22:53 +02:00
Gerry Raab 23201670b1 Phrasentext delete 2016-07-04 18:25:35 +02:00
paolo de7fc12c62 Changes in migration script 011_reihungstest 2016-07-04 17:57:14 +02:00
paolo 10963be983 Merge origin/ci into ci 2016-07-04 15:37:35 +02:00
paolo ba0e2bb7ff MigrationLib to help with the migration procedure 2016-07-04 15:36:53 +02:00
Stefan Puraner f08f85afe2 fixed table name 2016-07-04 11:48:10 +02:00
paolo 4902f41a3f Added addSelect to DB_Model 2016-07-01 12:17:08 +02:00
paolo 9cce095e9b - Added permissions for table public.tbl_rt_person
- Added method postAddReihungstest to controller Prestudent
- Added method getReihungstestByPersonID to controller Reihungstest
- Fixed tables structure in the migration script 011_reihungstest.php
- Added model RtPerson_model
2016-07-01 10:50:37 +02:00
Paminger ad8c5bfb32 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-01 00:28:18 +02:00
Paminger 93422b75b5 BugFix 2016-07-01 00:27:57 +02:00
paolo ce3a2f26d3 Extended migration tool to allow the prestudenten to sign more reihungstests 2016-06-30 17:43:32 +02:00
Paminger 075312963e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-30 07:22:34 +02:00
Paminger 09787cca65 BugFix PhraseLib 2016-06-30 07:22:18 +02:00
paolo 341d5cf8da Changed method getGemeinde of controller Gemeinde, now it returns all data
if no parameters are specified. Data are ordered by the field plz.
2016-06-29 16:27:25 +02:00
paolo 7cdac1d047 Added method getByStudiengangStudiensemester to controller Reihungstest 2016-06-29 16:16:14 +02:00
paolo a3210781ea - Added permission system/vorlagestudiengang to dump.sql
- Added method getMessagesByToken to controller Message
- Library MessageLib now load the helper fhc_helper
- Added new method getMessagesByToken to library MessageLib
- Added field relationmessage_id to methods sendMessage and sendMessageVorlage
- Method sendMessageVorlage now checks if the text and the subject for
the template are not empty
- Method sendMessageVorlage now saves the token automatically generated
- Method sendMessageVorlage now return a more comprehensive error message
- Method getMessagesByPerson of Message_model now checks for the right permissions
- Added fields relationmessage_id and person_id in getMessagesByPerson query
- Added method getMessagesByToken to model Message_model
2016-06-29 15:41:40 +02:00
paolo 94ae62ca14 Changed the method postMessage of controller Message, now it works even
without recipients
2016-06-29 10:45:32 +02:00
Paminger 73c36d8520 BugFix 2016-06-29 09:34:51 +02:00
Paminger 48655039ba Move public.phrase to system.phrase and change phrase_inhalt to phrasentext 2016-06-29 09:32:51 +02:00
Paminger 9a44c818ea FHC Helper 2016-06-29 08:41:02 +02:00
Paminger 6af45f99f6 BugFix 2016-06-29 08:08:06 +02:00
Paminger 4e6c1bd9fd Dont set rights in Migration files 2016-06-29 08:05:57 +02:00
Paminger b4fdd11686 BugFix 2016-06-29 08:00:29 +02:00
Paminger 9108b9ecd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-28 22:11:12 +02:00
Paminger 0d55276bd2 Checkroles 2016-06-28 22:10:56 +02:00
paolo a68dfa7ba2 Added method postChangeStatus to controller Message 2016-06-28 18:13:20 +02:00
paolo bcc42f2b02 Fix: the query present in the method AllForBewerbung of the model Studiengang_model is changed, now it doesn't work anymore with the view vw_studienplan, that it is deprecated. 2016-06-28 15:36:27 +02:00
paolo d2e3a346ce Fix: Phrase controller still tries to use the method _getUID 2016-06-28 15:05:02 +02:00
Paminger f3c2630a66 SeedBugFix 2016-06-28 12:53:53 +02:00
Paminger e21b2f6233 Seeds 2016-06-28 12:34:12 +02:00
paolo 5e4090e0ce _validate method of Person controller now checks correctly the parameters, in accordance with the table structure 2016-06-27 14:58:46 +02:00
paolo bee12ac317 Fix: method getAuthUID of the helper fhcauth_herpel.php, sometimes it
misses the uid
2016-06-27 12:17:16 +02:00
paolo c2c4620af9 Merge origin/ci into ci 2016-06-24 13:22:43 +02:00
paolo 9a4f5480c4 - Added permission basis/phrase to dump.sql
- The function getAuthUID() present in the helper fhcauth_helper.php
now tries to work always with CI session to get the uid
- REST_controller doesn't need anymore to handle the uid
- FHC_Controller and FHC_Model load fhcauth_helper in their constructor,
so any class that extends them now could call the function getAuthUID()
anywhere in the code
- The controllers don't need anymore to pass the uid to the models or to the
libraries
- Library FHC_DB_ACL load fhcauth_helper in its constructor and uses getAuthID()
2016-06-24 13:22:27 +02:00
Paminger 74186cc5c6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/DB_Model.php
2016-06-24 13:09:44 +02:00
Paminger 925d210bff Permission Problem workaround 2016-06-24 13:08:18 +02:00