Commit Graph

63 Commits

Author SHA1 Message Date
Uwe Steinmann
d6e10dddd6 pass $content to controller, not $latestContent
$latestContent and $content are different objects. If $latestContent
is passed to the controller, its status will be updated in the object
but $content has still the old status. Getting the status later on
from $content, still returns the old content.
2017-07-13 14:55:51 +02:00
Uwe Steinmann
6e37e1ded6 fix check for new content status 2017-07-13 14:11:04 +02:00
Uwe Steinmann
2a38d713b8 get approval status before sending notification mails
the approval status was simply not known because part of the code
went into the controller
2017-06-29 15:34:32 +02:00
Uwe Steinmann
c6d26ec3fa Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-12-15 06:42:15 +01:00
Uwe Steinmann
13bab66b6f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-08 18:21:08 +01:00
Uwe Steinmann
dfc0db8bc5 no longer send notif. to owner 2016-12-08 18:14:54 +01:00
Uwe Steinmann
70a1a20070 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-08 15:43:07 +01:00
Uwe Steinmann
3ae469fd2b remove old notification code 2016-12-08 15:37:12 +01:00
Uwe Steinmann
2cc90ccbaf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-06 15:29:11 +02:00
Uwe Steinmann
1541fc26ec Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-06 15:27:52 +02:00
Uwe Steinmann
c670ca4639 fix typo 2016-10-05 16:23:22 +02:00
Uwe Steinmann
148088f42a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-09 07:55:52 +02:00
Uwe Steinmann
ffab03a8b8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-09 07:55:35 +02:00
Uwe Steinmann
6303973618 fix copyright in header 2016-08-09 07:34:30 +02:00
Uwe Steinmann
6893b26818 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-21 13:34:47 +02:00
Uwe Steinmann
ac2be17814 set url for approval request email (Closes: #259) 2016-04-20 20:01:59 +02:00
Uwe Steinmann
6deefda545 use $newdocstatus instead of $newStatus 2016-03-23 17:33:04 +01:00
Uwe Steinmann
51fa5d18e6 enhance AccessOperation by check_view_access()
all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
2016-03-03 07:39:04 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
250400a9cb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-25 17:01:52 +01:00
Uwe Steinmann
eda80242ea some reorganization of email notification 2015-11-25 16:49:09 +01:00
Uwe Steinmann
c4f7223293 Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:13:14 +02:00
Uwe Steinmann
482143c04f pass $dms to contructor of SeedDMS_AccessOperation 2015-08-07 13:11:50 +02:00
Uwe Steinmann
5c43f191ce propperly check access rights 2015-06-15 14:20:51 +02:00
Uwe Steinmann
3b0d239a00 propperly check for access right 2015-06-15 14:17:16 +02:00
Uwe Steinmann
80a49262f4 propperly check for sufficient access rights 2015-06-15 14:14:31 +02:00
Uwe Steinmann
67d10d10ae use access operation to check if document may be reviewed 2015-06-15 09:05:20 +02:00
Uwe Steinmann
ba74861ae7 use access operation to check if operation is allowed
Conflicts:
	op/op.ReviewDocument.php
2015-06-15 09:00:21 +02:00
Uwe Steinmann
4215532a9c use access operation to check if operation is allowed 2015-06-15 08:54:33 +02:00
Uwe Steinmann
fcddfb0162 allow to upload a file with each review/approval
Conflicts:
	op/op.ApproveDocument.php
	op/op.ReviewDocument.php
2015-06-11 21:37:41 +02:00
Uwe Steinmann
d36ba8d906 allow to upload a file with each review/approval 2015-06-11 21:32:29 +02:00
Uwe Steinmann
220329c1b8 allow to upload a file with each review/approval 2015-06-11 21:30:56 +02:00
Uwe Steinmann
083e2a55a9 add currenttab to link when redirecting to out/out.ViewDocument.php
Conflicts:
	op/op.AddDocumentLink.php
	op/op.ReceiptDocument.php
	op/op.RemoveDocumentLink.php
	op/op.ReviseDocument.php

Conflicts:
	op/op.AddDocumentLink.php
	op/op.RemoveDocumentLink.php
2015-06-09 09:07:51 +02:00
Uwe Steinmann
d0b32e0fb8 add currenttab to link when redirecting to out/out.ViewDocument.php
Conflicts:
	op/op.AddDocumentLink.php
	op/op.ReceiptDocument.php
	op/op.RemoveDocumentLink.php
	op/op.ReviseDocument.php
2015-06-09 09:04:41 +02:00
Uwe Steinmann
380ac2f1bd add currenttab to link when redirecting to out/out.ViewDocument.php 2015-06-09 08:59:25 +02:00
Uwe Steinmann
4e15fee3fb set url for notifaction mail 2015-06-01 14:01:02 +02:00
Uwe Steinmann
bcff843186 set comment in notification mail 2015-06-01 07:36:14 +02:00
Uwe Steinmann
19b9888d34 place business logic into controller 2015-06-01 07:16:21 +02:00
Uwe Steinmann
52a2106155 include correct files in right direction 2015-04-29 20:08:46 +02:00
Uwe Steinmann
eefc346312 include correct files in right direction 2015-04-29 20:08:10 +02:00
Uwe Steinmann
e486254d80 include inc/inc.Init.php, new order of include files 2014-12-08 14:47:32 +01:00
Uwe Steinmann
9a6772b59a use defines S_DRAFT_APP and S_RELEASE instead of numbers 2013-09-27 08:24:09 +02:00
Uwe Steinmann
78dd186742 set url in notification email (Bug #56) 2013-05-31 07:55:40 +02:00
Uwe Steinmann
34b72a17a1 reworked notification system
The notifaction will now be send in the language as specified in the
user's profile
2013-03-06 12:53:25 +01:00
steinm
8432ce207b do not use internal variables of LetoDMS_Core_xxx classes 2013-01-24 10:12:15 +00:00
steinm
cab3ab9a00 - minor code change not changing operation 2012-10-09 10:05:49 +00:00
steinm
4a67f259bf - added form key 2012-09-11 13:15:59 +00:00
steinm
d44f2911fe - do not use mydmsDecodeString() anymore 2011-12-05 14:32:26 +00:00
steinm
3e1926d4c8 - do not pass 'true' to $content->getReviewStatus() 2011-12-05 08:14:25 +00:00
steinm
a027d7c962 - remove sanitizeString() where possible 2011-12-02 18:44:42 +00:00