Commit Graph

104 Commits

Author SHA1 Message Date
ralf
a3a893ae14 allow to request merged download in a different format eg. PDF 2022-06-10 10:52:26 +02:00
ralf
2d0de5f287 another chunk of fixed PHP Warning: Undefined array key or variable in api 2022-04-26 20:24:37 +02:00
nathan
75e573b6a1 * Api: Merge placeholder that checks for EMPTY {{IF fieldname~EMPTY~True text~False text}}
EMPTY check was already there, just adding it explicitly into the placeholder list
2022-04-12 09:04:18 -06:00
Ralf Becker
be1920b687 fix PHP 8.0 TypeError: array_keys(): Argument #1 ($array) must be of type array, null given 2021-11-13 17:39:33 +01:00
nathan
e3526d2bef Api: Fix "Unsupported operand types: array + bool" when infolog linked contact could not be read 2021-10-22 09:39:24 -06:00
nathan
4e54c2b5a3 Api: Fix merge action files in subdirectories had their path as part of action caption instead of just the file name 2021-10-21 09:51:05 -06:00
Ralf Becker
b1af39be37 fix big chunk of PHP 8.0 warnings 2021-10-21 10:39:57 +02:00
nathan
82423d60bb Api: Fix cf sub-entry placeholder expansion was not passing content for placeholders like {{#customer/n_fn}} 2021-10-20 14:08:43 -06:00
nathan
7a7f80f7d9 Api: Fix replacements from sub-apps (eg: infolog contact) were missing 2021-10-19 09:17:22 -06:00
nathan
33fcb4e657 Infolog: Avoid errors adding app replacements if incorrect parameters given 2021-10-15 09:09:53 -06:00
nathan
93108177ce Remove unwanted use 2021-10-14 13:34:54 -06:00
nathan
aefeade501 Placeholder / merge translations 2021-10-14 09:05:12 -06:00
nathan
98ed7edda4 Fix incorrect default preference for merged document filenamer 2021-10-13 15:47:01 -06:00
nathan
047b86f38b Placeholders list common UI: different recursion check for better results
This one still puts simple customfields in, but just skips the linked apps cfs
2021-10-13 08:39:23 -06:00
nathan
7dba4b9284 Placeholders - avoid infinite recursion if apps have custom fields of other apps 2021-10-12 15:44:48 -06:00
nathan
9e2bb05ded Placeholders list common UI
Should reduce maintenance by using a common UI to show placeholders based on the placeholder list
2021-10-12 14:18:18 -06:00
Hadi Nategh
309e020324 Fix error "Non-static method Merge::get_all_ids() cannot be called statically" 2021-10-12 12:54:56 +02:00
nathan
d43c27a31b Fix nested placeholders (customfields from other apps) were not being displayed properly 2021-10-07 14:51:16 -06:00
nathan
da6a16e62d - Add generation target path preference to all apps
- Use common method to get merge preferences to reduce duplication
2021-10-07 10:22:45 -06:00
nathan
40af04e38e Fix broken Merge::get_app_class(), we need it to autoload the class 2021-10-07 09:31:43 -06:00
Ralf Becker
b1780a35bc fix Api\Storage\Merge::document_editable_action(): Argument #1 ($action) must be of type array, null given 2021-10-07 12:17:33 +02:00
nathan
45f039da95 * Add preference to set the filename of merged documents using placeholders 2021-10-06 11:59:29 -06:00
nathan
a0a89a6b74 Placeholder dialog: Add placeholders for projectmanager, timesheet, tracker 2021-10-05 16:09:39 -06:00
Ralf Becker
ddddc5ba05 next big chunk of fixed PHP 8.0 Warnings 2021-10-05 14:11:11 +02:00
nathan
6126bc2ac9 Placeholder dialog: Placeholder groups can now have groups
References (info_contact)/ customfields to other apps are expanded so all their placeholders are available as well
2021-10-04 14:45:57 -06:00
Ralf Becker
ac7faf6036 fix PHP 8.0 error: count(): Argument #1 ($value) must be of type Countable|array, string given 2021-10-04 13:02:34 +02:00
nathan
117b193a63 Add some missing general placeholders 2021-10-01 13:37:17 -06:00
nathan
71ef7ccd0d Fix some merge action bugs:
- default document wasn't working properly, missing caption
- Email documents were giving "Unable to generate merge file"
2021-10-01 10:06:29 -06:00
nathan
1dc9dd0c6b * Add a preference so you can choose where merged documents are put 2021-09-30 12:01:37 -06:00
nathan
fb88f8846b Merge as PDF:
- improve error logging
- remove original merge result when PDF conversion succeeds
2021-09-29 11:01:07 -06:00
nathan
707c57ecf0 * Add option to merge documents as PDF 2021-09-28 17:00:55 -06:00
nathan
2a4faf0137 * Add filemanager actions to convert editable files to PDF or PNG 2021-09-28 14:48:25 -06:00
nathan
7f930a6221 Placeholder dialog: Support for other apps, starting with Infolog 2021-09-27 14:46:41 -06:00
nathan
eb57294146 Placeholder dialog: Allow & show general fields 2021-09-27 11:09:38 -06:00
nathan
47cf12869b Utility function to add prefix to placeholder & optionally wrap it with markers, because I was writing it out so many times 2021-09-27 10:54:57 -06:00
Ralf Becker
d9f759f517 fix PHP 8.0 error: implode(): Argument #2 ($array) must be of type ?array, string given 2021-09-24 12:29:48 +02:00
nathan
704b6c6dc2 Add user placeholders into placeholder dialog 2021-09-22 11:15:49 -06:00
nathan
d512238dc0 * Collabora: Add address insert dialog 2021-09-21 14:07:22 -06:00
nathan
29bd739955 W.I.P on collabora placeholder insert 2021-09-20 15:34:55 -06:00
Ralf Becker
be3514c36f preferring get_rrows over get_rows to fix SQL error in timesheet merge 2021-09-13 18:02:39 +02:00
nathan
36df64085f * Api: Fix some merge files were opened in browser instead of downloaded 2021-09-03 09:33:32 -06:00
nathan
6c0aed651f Api: Add some extra parameters to Merge::merge_entries() so overridding classes can still use the parent method, passing in IDs & merge object 2021-08-09 13:44:43 -06:00
nathangray
b021767ac1 Make sure nested document actions open in new tab, same as others. 2021-07-05 09:46:00 -06:00
nathangray
34d601b102 Api: Fix missed change in nested document actions
see 186e03671a
2021-07-02 12:04:38 -06:00
nathangray
186e03671a Change merge download/Collabora to a common generation method, avoiding need to POST.
This allows Kanban to download merge files
2021-06-23 11:20:09 -06:00
Ralf Becker
fed41622c2 fixing all sorts of PHP 8 errors and PHPStorm errors 2021-03-31 17:50:01 +02:00
nathangray
8063d65303 Check that some things exist before trying to use them 2021-03-05 09:30:02 -07:00
nathangray
95f84454be Silence some warnings & debug 2021-03-05 09:13:12 -07:00
nathangray
ea41ab8e77 Api: Add charset parameter to tidy->repairString() to avoid mangling some non-ascii characters when merging into document 2020-10-14 14:53:37 -06:00
nathangray
151889b39c Api: Move list of common merge placeholders into parent class to reduce duplication, add link/<format> options 2020-10-06 10:56:08 -06:00