extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,272 Commits 32 Branches 355 Tags 194 MiB
7224b39bf9
Commit Graph

523 Commits

Author SHA1 Message Date
Nathan Gray
12e7552569 Implement export filters for resources 2013-01-22 22:44:15 +00:00
Ralf Becker
be6845b4d0 * All apps: merged missing translations from other apps or branches 2013-01-18 13:48:34 +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
67e4e8a6cb Missed translations usable -> useable 2013-01-15 16:17:50 +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
b283bbfb9f Turn on delete protection by default 2013-01-14 16:57:58 +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
7459e6ca27 If a resource has accessories, you can't change Accessory of and make it an accessory of something else - add message to template 2013-01-08 17:09:24 +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
5b94061086 Remove buyable & price from default definitions 2012-12-31 22:12:45 +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
9419fec5c6 Forgotten config template 2012-12-18 15:31:09 +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
9fc51055cd Use common rte preference 2012-12-06 17:14:18 +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
cc975d4c0d Update default definitions to include storage info, expect column Usable 2012-10-10 19:09:57 +00:00
Nathan Gray
3cd94c9557 Remove double conditions from default import definitions 2012-10-09 16:27:01 +00:00
Ralf Becker
e913a6a263 pending translations from translation.stylite.de 2012-08-08 12:11:04 +00:00
Nathan Gray
5ae2ad4964 Update default importexport definitions to use human values 2012-05-15 23:31:17 +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
Ralf Becker
0d3d77c76c add locations category required for CalDAV to distinguish between locations and resources, when updating from 1.8 2012-03-31 09:34:45 +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
Klaus Leithoff
cbcefbeb1f change add - submit button to button. (has no autofocus) 2012-03-06 16:06:57 +00:00
Nathan Gray
b126ccf8c3 Initialize accessory list array 2012-02-28 20:24:37 +00:00
Ralf Becker
3dadc207af fixed typo and added translation for new context-menu items 2012-02-22 12:48:02 +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
0d78091fe5 * resources/sitemanager integration: fixed broken resources sitemanager integration 2011-08-22 11:12:30 +00:00
Ralf Becker
17a41103d5 Loa language translation from vimontha <kvimontha@yahoo.com> 2011-08-09 06:12:25 +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
Oscar Manuel Gómez Senovilla
164871ec02 Update Czech translation for trunk. Tracker #2886 2011-06-23 13:53:19 +00:00
Ralf Becker
2bf55a7c87 some fixes for English and Suomi translation, from our Suomi resident here as Stylite 2011-06-22 15:53:36 +00:00
Nathan Gray
275a1d3f27 Change category list links 2011-06-21 21:14:51 +00:00
Ralf Becker
8e7c73dd84 some fixes for English and Suomi translation, from our Suomi resident here as Stylite 2011-06-16 13:01:29 +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
Ralf Becker
fcfbd038bc some fixes for the English translation, from our Suomi resident here as Stylite 2011-06-10 06:19:36 +00:00
Nathan Gray
27572ba4cf Move select all to above view calendar 2011-06-09 14:07:22 +00:00
Nathan Gray
71232c0ad5 No longer needed, done server side 2011-06-08 15:28:05 +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
Ralf Becker
9dfdabe1a3 some fixes for the English translation, mostly correcting case, from our Suomi resident here as Stylite 2011-06-07 06:29:49 +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
c81bd1a291 Change default charset from utf-8 to user's preferred charset 2011-05-24 15:57:16 +00:00
Nathan Gray
cae8752274 Make default import definitions available only to admins 2011-05-24 15:40:22 +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
eeb336c77d Missed etemplate change to allow custom fields in list 2011-03-24 14:22:18 +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
face5d34a4 By default, export all custom fields, use field labels instead of names 2011-03-02 17:18:05 +00:00
Oscar Manuel Gómez Senovilla
28d2b6b072 Update for translations in trunk 2011-01-30 12:53:49 +00:00
Nathan Gray
e2baa8ab1d Add default import/export definitions 2011-01-26 00:12:19 +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
Ralf Becker
50c43deec9 updating verson to 1.8 2010-09-05 15:24:34 +00:00
Oscar Manuel Gómez Senovilla
65f1702caa Tracker #2657 2010-08-25 16:23:17 +00:00
Oscar Manuel Gómez Senovilla
2f0df89b4f Tracker #2703 2010-08-25 16:14:29 +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
Klaus Leithoff
bf21aad052 translation provided by mkk 2010-05-20 08:07:13 +00:00
Klaus Leithoff
144f74cf80 translation provided by mkk 2010-05-20 08:07:12 +00:00
Klaus Leithoff
f4f8464414 translations provided by mkk and gm 2010-04-14 12:05:56 +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
Ralf Becker
2805cc1904 adapting resources install to changed categories class (cat_owner=0 instead -1) 2010-01-31 04:41:13 +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
Oscar Manuel Gómez Senovilla
7ef905e50a Recover history from rev 28595 2009-12-02 20:12:18 +00:00
Oscar Manuel Gómez Senovilla
f22c9b9731 Temporary removal to recover history from rev 28595 2009-12-02 20:11:30 +00:00
Oscar Manuel Gómez Senovilla
c45fb85003 Move lang files for resources 2009-11-28 17:53:41 +00:00
Klaus Leithoff
45e33f6e11 setting the size of the table of the mainview to 100% 2009-11-28 16:00:07 +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
Ralf Becker
2e4577ae83 skipping unnecessary redirect by directly displaying index-method link in navbar 2009-03-30 08:48:59 +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
3c3cf6d15c fixed old calendar method name in booking multiple ressources, thanks to Moe from the German list 2008-11-12 07:59:47 +00:00
Oscar Manuel Gómez Senovilla
7c3ab3ab8c tracker #1774, added estonian translation 2008-11-02 14:23:56 +00:00
Oscar Manuel Gómez Senovilla
3edee675a7 tracker #1812 2008-11-02 13:38:18 +00:00