Hadi Nategh
0756463e96
Fix resources show rghit header template
2014-01-16 09:10:27 +00:00
Hadi Nategh
7de85d97c9
Migrate Reources app from etemplate old to et2
2014-01-15 15:52:53 +00:00
Ralf Becker
43e1bfcc12
switching on Content-Security-Policy: script-src 'self' 'unsafe-eval' for all templates, old non-et2 apps can call egw_framework::csp_script_src_attrs('unsafe-inline') to enable inline scripts in their scope, et2 does it for CK editor which does not support CSP currently and old etemplate does it for all apps using it
2013-10-05 13:33:28 +00:00
Ralf Becker
f8a0db06fc
completly remove preferences menu from sidebox and tiled preferences index in favoir of app-sensitive entries in top-menu
2013-10-03 09:23:18 +00:00
Nathan Gray
d5d977d60b
Hide deleted resources from calendar sidebox list
2013-09-24 15:28:59 +00:00
Nathan Gray
cf8714293e
Open preferences in preferences tab
2013-08-13 17:37:15 +00:00
Ralf Becker
38056379a2
allways return an array, easier then copying with null in various places
2013-08-01 12:59:29 +00:00
Nathan Gray
36eae09fe0
Fix custom image being lost when you're in the edit dialog and click Apply, Save or Apply, Apply
2013-07-25 15:01:41 +00:00
Klaus Leithoff
bd3e741905
wrap inline javascript with LAB to avoid runtime trouble
2013-07-20 07:53:47 +00:00
Nathan Gray
5a6ed7c407
Change history accessory_of widget to match current template
2013-07-08 21:34:02 +00:00
Ralf Becker
26f9fb5cd0
remove old pre 1.8 preferences.php
2013-05-10 16:38:18 +00:00
Nathan Gray
087ea097b6
Default display filter to resources
2013-02-07 11:00:42 +00:00
Nathan Gray
2b8826c6ad
Fix export 'Use search results'
2013-01-23 18:03:00 +00:00
Nathan Gray
12e7552569
Implement export filters for resources
2013-01-22 22:44:15 +00:00
Nathan Gray
af4bdfb18d
Formatting for long description in history
2013-01-16 21:58:25 +00:00
Nathan Gray
b1484c2a1d
If un-deleting an accessory but not the parent resource, un-parent and make it a resource
2013-01-15 16:50:11 +00:00
Nathan Gray
eb104a9ee5
Nice handling for no read on any categories:
...
- Short-cut on link query to skip search - no categories means no results
- Hide add button - with no categories, user will not be able to save
2013-01-14 18:42:16 +00:00
Nathan Gray
207e94e8b4
- If purging a deleted resource & promoting accessories, restore accessories too
...
- Remove debug
2013-01-14 15:38:33 +00:00
Nathan Gray
19757ba8bf
Add prompt to restore accessories too when restoring (un-deleting) a resource
2013-01-09 17:20:01 +00:00
Nathan Gray
8e55f99ec2
When purging deleted resources, respect answer to accessories dialog - purge accessories too
2013-01-08 17:27:00 +00:00
Nathan Gray
9279c25b1c
If a resource has accessories, you can't change Accessory of and make it an accessory of something else
2013-01-08 17:05:55 +00:00
Nathan Gray
38b6c1a500
Add fallback for accessory of links to try a match on just name, to get around the case when someone edits the CSV file and changes the short description, which is used as part of the link title
2013-01-08 15:56:48 +00:00
Nathan Gray
442c3d605e
When changing a resource with accessories to an accessory, change existing accessories to resources, and give a message to the user
2013-01-07 16:21:08 +00:00
Nathan Gray
9b7da1f611
Include deleted/held accessories in change to resource
2013-01-03 16:35:02 +00:00
Nathan Gray
81a674cd8c
Change delete handling to avoid purging accessories when delete+hold resources
2013-01-02 22:15:26 +00:00
Nathan Gray
5564217b0c
- Hide buyable & prize fields from import|export
...
- Hide customfields column if no customfields defined
- Fix export all breaks list view
2013-01-02 17:32:30 +00:00
Nathan Gray
fcda447798
Delete & hold accessories when deleting a resource
2012-12-31 21:57:14 +00:00
Nathan Gray
cb84d313e8
Fix importing when accessory_of is missing
2012-12-19 20:23:40 +00:00
Nathan Gray
f25232ad32
Give deleted resources a deleted icon instead of thumbnail
2012-12-19 18:12:42 +00:00
Nathan Gray
4fce430ef9
Add missed tracking file, required before history logging works
2012-12-19 17:24:49 +00:00
Nathan Gray
1c4f15078d
Fix usable vs useable. Both are right, but seems useable is more frequent in code.
2012-12-18 16:35:24 +00:00
Nathan Gray
a3513a9797
Add history logging & delete protection
2012-12-17 22:14:32 +00:00
Nathan Gray
72b30aaf93
Add accessory_of field to import/export & update import plugin
2012-12-17 19:03:10 +00:00
Nathan Gray
64c653f253
Remove selected accessories from checked list when deleting resource. Deleting the resource deletes all accessories, and gives an error if we try to delete it after that
2012-12-12 00:28:54 +00:00
Nathan Gray
f3f2f4d9ab
Clear checked array before adding all resources - duplicates cause errors
2012-12-10 15:44:30 +00:00
Nathan Gray
d14337da40
- Always use chosen for calendar resource select
...
- Change sidebox/context add resource to always add a resource, never an accessory
- Fix link to calendar (planner) to open in calendar app/tab
2012-12-05 19:25:32 +00:00
Nathan Gray
59c35020e7
When viewing accessories of a resource
...
- Add button adds an accessory
- Allow context menu -> add accessory = add accessory to resource, _not_ selected accessory
2012-12-04 23:57:02 +00:00
Nathan Gray
e765fda60e
Fix preset resource catagory from nextmatch
2012-12-04 23:42:56 +00:00
Nathan Gray
5aaaca3c81
- Disable custom tab if there are no cfs defined
...
- Use link_title for resource accessories in list
- Pre-set category according to list filter or parent resource
2012-12-03 20:20:42 +00:00
Nathan Gray
f5a4fa694c
Remove debug
2012-11-27 18:10:55 +00:00
Nathan Gray
0fd3388221
Handle delete selection more intelligently, handling mixed selection of accessories and resources
2012-11-27 18:08:13 +00:00
Nathan Gray
a821b7a567
- Fix apply button clearing new resources
...
- Fix deleting accessories not actually removing them
2012-11-27 16:47:12 +00:00
Nathan Gray
147b926490
- Remove 'Add accessory button'
...
- Fix bug in delete confirm
- Fix link url
2012-11-26 21:04:31 +00:00
Nathan Gray
4b4308dcff
Add missing accessory of selectbox, re-order context menu items
2012-11-20 21:30:35 +00:00
Nathan Gray
0f1b273cb1
- Add accessory of selectbox to move accessories between resources
...
- Remove 'back' button, viewing accessories of a resource now uses nm filter entirely
- Remove view, using read-only edit
2012-11-14 18:00:02 +00:00
Nathan Gray
052897fcd8
- Add display filter to view resources, accessories, or both
...
- Change view accessories activity to depend on the existance of accessories in DB, not links
- Add view accessories action to context menu
2012-11-13 17:26:31 +00:00
Nathan Gray
78011ed719
Ask what to do with accessories when deleting a resource
2012-11-06 23:17:26 +00:00
Nathan Gray
a4b71c7d3a
Fix 12 hour afternoons
2012-05-03 02:15:35 +00:00
Nathan Gray
ab63063023
Restrict times to working hours, from calendar
2012-05-03 02:11:36 +00:00
Klaus Leithoff
2f4a486c10
* resources: fix for missing/not loaded pictures for resources in default/images/resource_icons/
2012-04-24 06:56:43 +00:00
Nathan Gray
62a98e50be
Allow to include an extra group in event participants
2012-04-12 23:04:49 +00:00
Nathan Gray
340628e721
Use sitemgr user's default appointment duration for booking time blocks
2012-04-12 22:20:21 +00:00
Nathan Gray
4aa875b885
Avoid warning on missing accessories
2012-04-12 22:18:22 +00:00
Klaus Leithoff
13a217d815
* resources: fix broken import when importing with human readable names (not database values)
2012-04-04 11:58:05 +00:00
Ralf Becker
11d39d7edd
testing trailing whitespace commits
2012-04-04 09:46:17 +00:00
Nathan Gray
83c3cee10d
Use standard app.class.method format
2012-03-30 21:06:16 +00:00
Ralf Becker
ee8fd5b10e
found a lot more calls to get_rows missing to set csv_export flag and fixed code in nextmatch dealing with situation if num_rows=-1 got stored in prefs anyway
2012-03-29 12:06:10 +00:00
Nathan Gray
b126ccf8c3
Initialize accessory list array
2012-02-28 20:24:37 +00:00
Nathan Gray
90ccc3f8fc
Sitemgr reservations - Add confirmed addressbook option to move confirmed contacts
2012-02-14 21:01:03 +00:00
Nathan Gray
59b277ec5f
A new sitemgr module for public reservation of one specified resource. Uses an emailed confirmation link to confirm the reservation
2012-02-11 00:47:54 +00:00
Klaus Leithoff
ba9c778c68
fix for missing groups in acl-account-list for write / cal-read / booking
2012-01-24 12:20:29 +00:00
Klaus Leithoff
77e38999c4
* resources: change / introduce sorting for display of Account/Group List in ACL management; in addition groups are now sorted to the end of the list
2012-01-24 11:41:26 +00:00
Klaus Leithoff
53d5c88c14
check, that a possible col_filter is not overwritten by possible customfield col filters
2012-01-23 13:54:44 +00:00
Ralf Becker
11e6879aac
* Calendar/Resources: do NOT unselect currently selected calendars when selecting a resource category, eg. to choose a meeting room
2012-01-09 21:26:41 +00:00
Nathan Gray
f6a443a917
Add warnings to import plugin
2011-12-15 16:24:47 +00:00
Ralf Becker
7c9dd8086f
changed "No defintion" to "Old fixed definition"
2011-11-21 10:01:08 +00:00
Nathan Gray
1afba81ce8
Add 'No definition' option for default export definition preference. Allows use of legacy nextmatch CSV export with Import/Export app still available
2011-11-18 16:01:57 +00:00
Ralf Becker
bca8179821
added some caching to not read resources multiple times from the database, specially in listing them, dont query db for every row multiple times
2011-10-14 08:36:12 +00:00
Ralf Becker
01e92100c4
ability to mark resource-categories to be used for locations or rooms, destinction is required for CalDAV
2011-10-13 06:21:46 +00:00
Klaus Leithoff
356d4b0db6
fix fatal error: unsupported operand type in resources_ui line 428; reported on community tracker#3006
2011-07-08 07:47:45 +00:00
Nathan Gray
31d1e20bdc
Fix typo: definitition -> definition
2011-07-04 20:00:26 +00:00
Nathan Gray
275a1d3f27
Change category list links
2011-06-21 21:14:51 +00:00
Ralf Becker
07972fc074
fixed not set group causing Open action to be displayed below all other actions
2011-06-11 11:12:39 +00:00
Nathan Gray
8abc20badf
Order link search results by name
2011-06-10 14:20:47 +00:00
Nathan Gray
27572ba4cf
Move select all to above view calendar
2011-06-09 14:07:22 +00:00
Nathan Gray
b3886ab828
Use a server call for all actions so whole query works
2011-06-08 15:27:46 +00:00
Nathan Gray
e9d33a174d
- Add more complicated actions
...
- Some other UI changes
2011-06-08 02:27:42 +00:00
Nathan Gray
249363f2b4
Add basic context menu
2011-06-06 17:46:01 +00:00
Nathan Gray
563b2f57ee
Only give calendar categories where the user has access to the resource's calendar
2011-06-03 00:05:37 +00:00
Nathan Gray
16f9f37576
Add storage_info to list of fields for import/export
2011-04-14 17:05:16 +00:00
Nathan Gray
951f2b1a08
Attempt to set permissions for automatically created categories.
2011-04-14 16:57:49 +00:00
Nathan Gray
e61bb1abf7
Make sure lookups is initialized to an array
2011-04-13 14:32:45 +00:00
Nathan Gray
3333d18fae
Avoid warning from array_shift() if egw_link::delete_attached() doesn't return an array
2011-04-13 14:16:05 +00:00
Nathan Gray
d204c688c8
Strip HTML tags from long description
2011-04-05 23:36:40 +00:00
Nathan Gray
1c4101575c
Fix typo in error messages
2011-04-04 19:07:23 +00:00
Nathan Gray
fa8bf4218e
Use automatic processing for human friendly values
2011-04-04 19:07:06 +00:00
Nathan Gray
b8c35b954f
Default selection to search results
2011-03-28 22:10:59 +00:00
Nathan Gray
01fa7e080a
Rename ID field to Resource ID to deal with Excel issue
2011-03-28 17:03:53 +00:00
Nathan Gray
e5bb02d799
Add preferences so default export definition can be set
2011-03-28 15:37:26 +00:00
Nathan Gray
0abd9582cd
Update with some best practices:
...
- Change backend to use so_sql_cf to get custom fields into nextmatch
- Change file names to resources_*
- Fix missing category filter when returning from viewing accessories
2011-03-23 15:25:59 +00:00
Nathan Gray
31fd9eddc6
Fix for import / update search for existing record. If new record key (ex ID) was not set, search matched all
2011-03-21 23:05:26 +00:00
Nathan Gray
2d7a2c5d32
Automatically handle converting+adding text categories without explicit translation
2011-03-09 18:25:22 +00:00
Nathan Gray
bf2155634d
* Add protection against inaccessable resources when their category is removed
...
Resources will be moved to the parent category, default category from setup, or an admin only 'No category'.
Resources' ACL requires a category
2011-01-07 22:31:59 +00:00
Nathan Gray
852497c4f6
Implode arrays when not exporting human-friendly values so they don't say 'Array'
2010-12-10 22:56:02 +00:00
Nathan Gray
fd93d0579a
Load custom field values, if needed
2010-11-23 18:27:14 +00:00
Nathan Gray
9c25a8c6d9
Respect convert to human friendly values option
2010-11-22 23:49:40 +00:00
Nathan Gray
1ddd40f94b
Add importexport support
2010-11-15 20:14:50 +00:00
Klaus Leithoff
0aaf531ec7
resources: allow to retrieve the elements of the resources sidebox calendar elements only and not as full html
2010-10-13 07:15:09 +00:00
Klaus Leithoff
ea6ad0129a
check the cat filter. If you have no read rights for any cats (and with that resources) set the cat-filter to null. As cat_id is enforced for resources by UI, you should not ret any results, which is expected if you have no read rights.
2010-07-08 15:01:40 +00:00
Ralf Becker
0b417cf339
fixed not working resource selection in calendar
2010-06-10 12:29:32 +00:00
Ralf Becker
bb76ce8cc1
using javascript:open_window url, instead of html markup
2010-06-04 11:37:38 +00:00
Nathan Gray
4653674fa9
Define colums_to_search and use search2criteria() to get extra search functionality
2010-04-01 20:57:15 +00:00
Ralf Becker
936c636ffd
display upload failed (because post_max_size of webserver exceeded) message from etemplate, could be nicer but way better then before
2010-02-05 03:34:17 +00:00
Klaus Leithoff
4e2ae9e19c
fix typo?
2009-12-11 14:29:41 +00:00
Nathan Gray
4139c23ef7
Implement new link hook view_list, to be able to be taken to a list of entries
2009-12-08 23:10:06 +00:00
Nathan Gray
00a75858ea
Implement options so link_query() can be limited
2009-12-08 23:09:45 +00:00
Ralf Becker
d91933ac5f
"fixed IE8 problem (maybe other IE version too): can NOT select resource"
2009-11-24 11:55:10 +00:00
Ralf Becker
e98c7b8770
"fixed missing categories in \"all categories\" filter, if (sub-)categories have same names"
2009-11-06 18:47:31 +00:00
Ralf Becker
18b145fe24
"identing category levels a bit more"
2009-11-06 10:00:02 +00:00
Ralf Becker
c531f0077e
- inherit ACL and admin from parent categories
...
+ ACL get or'ed together (you can't take away rights)
+ admins only get inherited, if there's none defined in cat
- store state of category filter for select resource popup (not
currently used in stock EGroupware)
2009-11-05 19:37:28 +00:00
Ralf Becker
0548cf5770
- added roles to UI
...
- enabling again resource booking without direct booking permission
(status is then unknown, not accepted)
2009-10-12 19:16:42 +00:00
Ralf Becker
e13a988433
"upps debug message ;-)"
2009-09-29 10:07:03 +00:00
Ralf Becker
fd7fedabaf
- new method to read multiple titles with one sql query
...
- pre-seeding title cache from get_calendar_info()
2009-09-29 10:02:09 +00:00
Ralf Becker
84519f0575
Modernized resource selection
...
- optional extra columns: description, location, storage info
- using column selection and nm sort-headers
- give selectbox more space 20% now
2009-09-29 09:30:41 +00:00
Ralf Becker
bfb5eb6682
"fixed not working regular expression to hide .picture.jpg, it was hiding all attachments"
2009-09-20 09:47:48 +00:00
Ralf Becker
b928db2182
some improvments for resource selection
...
- if parent cat select also return children
- disable column selection and csv export
- small rework of UI (more compact and close to rest of EGw)
2009-08-10 19:50:36 +00:00
Ralf Becker
97514cd296
"make cat selection identical to etemplate stock one"
2009-08-10 19:19:10 +00:00
Ralf Becker
232252475f
patch fixing many depricated functions (eg. posix regular expressions) and features, which fill up the error_log under php5.3 (and will no longer be available under php6).
...
Patch is mostly created by script in egroupware/doc/fix_depricated.php in separate commit.
I do NOT advice to apply this patch to a production system (it's commited to trunk!), as the automatic modified regular expressions have a good change to break something ...
2009-06-08 16:21:14 +00:00
Klaus Leithoff
0977164c37
fixed a bug connected to ralfs category patch
2009-02-25 09:00:58 +00:00
Klaus Leithoff
fd1e565e6e
quitening some errors, regarding some not found calendar/link data
2009-02-20 12:52:16 +00:00
Ralf Becker
b17b108062
"using static method of config class to fetch the custom fields"
2008-10-25 05:25:52 +00:00
Klaus Leithoff
78c724b0cb
fixed a bug (copy&paste error) that hindered the saving of customfields
2008-10-24 11:30:53 +00:00
Klaus Leithoff
f5b04aa513
fixing a bug related to the saving of an resource, with an own picture already attached
2008-10-24 11:04:27 +00:00
Klaus Leithoff
c42bcee466
fixed typo/extra if in switch statement
2008-10-20 14:01:43 +00:00
Ralf Becker
b7d41043ac
Store pictures now like file attachments with name .picture.jpg
...
(they are suppressed from being displayed as regular attachment).
Thumbnails are handled via etemplates thumbnail facility.
2008-10-10 17:04:22 +00:00
Ralf Becker
6ae2813e65
patch #1624 from Regis Leroy: check resource availablity on search and config to deny resource reservation on private events, plus German translation
2008-10-10 10:24:31 +00:00
Ralf Becker
785189d884
"sort users/groups by account_display pref"
2008-08-09 04:43:31 +00:00
Ralf Becker
e22ed15774
fixing renamed classes in calendar
2008-06-12 07:49:30 +00:00
Ralf Becker
b484528188
use new vfs end egw_link class
2008-04-20 19:37:12 +00:00
Ralf Becker
d7fe53b79e
removed unnecessary instancations and using static methods of html and egw_link class
2008-03-25 16:07:08 +00:00
Ralf Becker
e88080d520
"fixed bug: resources search to create links returns only maxmatch entries"
2007-06-25 16:43:32 +00:00
Ralf Becker
20fcee771b
"php5.2"
2007-05-09 08:07:06 +00:00
Cornelius Weiß
673ab75e7f
fix for bug #665 search not working
2007-05-04 11:37:19 +00:00
Cornelius Weiß
d2a886fef2
first resource was not found when searching bookable resources
2007-04-26 20:50:14 +00:00
Cornelius Weiß
30d5e3b7ee
show calendar icon only if calendar read permissions are granted for a given cat
2007-02-25 20:04:41 +00:00
Cornelius Weiß
093708ae45
fix bug #255
2007-02-25 19:42:15 +00:00
Cornelius Weiß
279148ccf6
speed improvements sugested by thomas ebeling
2006-12-07 08:12:19 +00:00
Cornelius Weiß
325bd84d47
fix for bug #1552616 => disapearing resources in calendar
2006-09-15 19:37:19 +00:00
Cornelius Weiß
2bf64c906d
link_title method returns now null to indicate an entry does not exist (and all links can be deleted) or false if there are insufficent rights to view the title
2006-06-27 16:30:53 +00:00
Ralf Becker
dcd5d3f91a
link_title method returns now null to indicate an entry does not exist (and all links can be deleted) or false if there are insufficent rights to view the title
2006-06-24 16:12:56 +00:00
Cornelius Weiß
0decebd55b
merge from 1.2
2006-05-18 16:14:35 +00:00
Cornelius Weiß
47d0963171
search alsoin field inventory-number
...
switch to planner-view of calendar by default
2006-03-29 19:56:18 +00:00
Ralf Becker
8cc0f09457
fixed an improved the interaction of calendar with the resources app:
...
- calendar owners set by the user- and the resource-selection are now independent, so you can add some users to your view and then add resources (without using the users again)
--> Interface with resources changed
- the resources selection now shows all selected resources, allows a multiselection and has an extra option none, to remove all resources from the cal-view
2006-03-06 07:15:54 +00:00
Cornelius Weiß
f154645215
killed warning reported by jens benner
2006-01-20 07:10:18 +00:00
Cornelius Weiß
a45d978366
fix: cats where not recongnised on large number of cats
...
fix: cats where not displayed after creation
2006-01-17 16:49:46 +00:00
Cornelius Weiß
46e955fd0c
fixed bug reported by jsantand:
...
deleting of resources by non priveleged users
2005-12-04 22:06:02 +00:00
Cornelius Weiß
c335cd37a9
added customfields
...
raised versionnumber to 1.2
2005-11-14 18:16:56 +00:00
Cornelius Weiß
1e478273d3
fix non using global cats
...
adjust link registry
adjust popups due to the new help icon
2005-11-11 21:21:50 +00:00
Cornelius Weiß
1315d99b88
some more documentation updates
2005-11-10 23:35:55 +00:00
Cornelius Weiß
4e20826dcf
update documentation to run properly in phpdoumentor
2005-11-09 21:03:35 +00:00
