Commit Graph

50 Commits

Author SHA1 Message Date
nathangray
6abb75cd5c Add conflict check when listing resources in a category for calendar owner / participan 2016-09-28 11:01:10 -06:00
nathangray
16b131c883 Fix resource booking conflict indication 2016-09-12 11:42:27 -06:00
nathangray
25ccd1134f Avoid &nbsp in resource subcategory name when searching for calendar 2016-08-18 11:42:50 -06:00
nathangray
b10c2d68fa Fix resource categories to work when first added from search results 2016-07-20 12:01:07 -06:00
nathangray
b039cccab5 Add a check to make sure $data is safe 2016-07-20 09:22:10 -06:00
nathangray
6d5f820b97 Add resource categories to owner / participant search results
In the sidebox menu, resource categories are returned and selectable and will show events for all resources in that category.
In the edit popup, if the category name matches the search string, all resources of that category are returned and user can select them as if they would have searched for the name of the resource.
2016-07-19 14:10:15 -06:00
Ralf Becker
4b75ed5e7f fix Scrutinizer "bugs" 2016-06-29 10:50:20 +02:00
nathangray
3253cce632 Update resources ACL UI 2016-05-26 15:32:00 -06:00
Nathan Gray
f550d4a503 In link_query conflict check decrement quantity available with real quantity used by calendar 2016-05-09 20:27:46 +00:00
Ralf Becker
251de1dc54 move category images to api, fixes PHP Fatal in admin_categories, if phpgwapi is not installed 2016-05-09 10:05:57 +00:00
Nathan Gray
cedab0ab00 Move resources to new API 2016-05-05 20:22:04 +00:00
Nathan Gray
40fbf3e2c9 Update for resource selection to re-enable conflict detection
- Remove account & contact options from default resource selection preference
- Edit dialog participant now passes selected start & duration, so conflict detection works again
2016-04-29 18:01:17 +00:00
Nathan Gray
14cb62a7db Change resource selectbox in calendar side menu to a tree 2015-12-08 00:59:01 +00:00
Hadi Nategh
6abaf60a22 Fix click on resources picture in edit dialog doesn't open expose view 2015-04-09 10:48:45 +00:00
Hadi Nategh
8caca5580c Some Fixes for images view:
-Fix images in listview, clicking on icons does not show the icons in expose view
-Fix images always stored as thumbnail and opening them in expose view does not open them in original size
-Clicking on thumbnail in details tab, will open the image in a popup with its original size
2015-04-08 14:32:13 +00:00
Nathan Gray
047ee13253 Fix some missed details and simplifications in resource search options 2015-03-12 16:50:47 +00:00
Nathan Gray
255494fc20 Fix resource participant search conflict checking 2015-03-12 16:24:55 +00:00
Hadi Nategh
76830f71af * Resources/list: Fix thumbnails size in resources' listview 2014-08-27 08:12:57 +00:00
Ralf Becker
349630ffa7 show calendars and ressource-calendars for user whos preferences are displayed, for "default" and "forced" we only display all and primary group calendars, but ressources of current user 2014-07-23 12:30:39 +00:00
Hadi Nategh
431f0f5168 Fix gen_src radio-button not beingable to be selected in resources edit popup 2014-03-18 14:14:00 +00:00
Hadi Nategh
5e6e016375 * Resources: Add new "res_creator,res_created,res_modifier and res_modified" columns to the database, and also, set their values in resources_bo 2014-03-18 09:39:30 +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
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
8e55f99ec2 When purging deleted resources, respect answer to accessories dialog - purge accessories too 2013-01-08 17:27:00 +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
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
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
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
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
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
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
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
4aa875b885 Avoid warning on missing accessories 2012-04-12 22:18:22 +00:00
Nathan Gray
b126ccf8c3 Initialize accessory list array 2012-02-28 20:24:37 +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
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
Nathan Gray
8abc20badf Order link search results by name 2011-06-10 14:20:47 +00:00
Nathan Gray
e9d33a174d - Add more complicated actions
- Some other UI changes
2011-06-08 02:27:42 +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
1c4101575c Fix typo in error messages 2011-04-04 19:07:23 +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