holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,563 Commits 27 Branches 330 Tags 157 MiB
ab3ffca7f8
Commit Graph

275 Commits

Author SHA1 Message Date
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
wnz_gh05t
c155417f45 language fixes 
fixed bug move accessory cats if master-cat is moved
 2005-11-03 22:48:30 +00:00
Ralf Becker
996f686d29 removed soacl, as it contained only calls to the acl-class of the API, which are ok in BO 2005-11-03 06:36:23 +00:00
Ralf Becker
c85d34c0fe changed the following table-names: 
- phpgw_accounts --> egw_accounts
- phpgw_acl --> egw_acl
- phpgw_log(_msg) --> egw_log(_msg)
- phpgw_config --> egw_config
- phpgw_applications --> egw_applications
This requires code-changes in many apps. Quite often I was able to replace the db access, with calls to the appropreate classes.
 2005-11-02 11:45:52 +00:00
Ralf Becker
0db87ad750 removed selectbox if no resource-cats exist (gave and error and empty selectbox before) 2005-11-02 10:37:00 +00:00
Cornelius Weiß
13659ddb5e fine adjustment of buttons 
buxfix in calendar select hook
added a sitemgr module
 2005-10-27 21:53:44 +00:00
wnz_gh05t
3e0ec3a586 Make selectbox remember what resources cat was selected 2005-10-27 18:43:08 +00:00
Cornelius Weiß
484297c45a show calendar icon makes only sense if resource is bookable :-) 
readonly fix for select-resources widget
 2005-10-18 22:07:12 +00:00
wnz_gh05t
c65589da23 make JS work for buttuns in sub-grid 2005-10-18 21:20:33 +00:00
Cornelius Weiß
4a4b6c3aaf added show popup on click on resources icon 2005-10-11 19:22:20 +00:00
Cornelius Weiß
ad013e644a don't show button: view accessory if resource is allready an accessory 2005-10-11 11:59:15 +00:00
Cornelius Weiß
afa3e63895 fixed buttons in list and details view 2005-10-09 10:13:10 +00:00
Ralf Becker
f54a3e1627 while deleting resources, delete their calendar entries (as participants) too 2005-10-08 11:06:58 +00:00
Cornelius Weiß
9532fc7af8 rearranged button layout to fit for egw stds 2005-10-04 23:02:18 +00:00
Ralf Becker
1fba46456d link class moved to the api 2005-10-01 21:12:36 +00:00
Ralf Becker
fef3601280 killed a warning, if cat contains no resources 2005-09-30 03:51:59 +00:00
Cornelius Weiß
7bba0e916d start work on calendar sidebox hook 2005-09-27 23:29:06 +00:00
Cornelius Weiß
078a60bced hoks for calendar ui 2005-09-20 21:54:08 +00:00
Cornelius Weiß
7dcf7f970e make qty working in opener-box 2005-09-14 21:28:41 +00:00
Cornelius Weiß
77a26d420a fixed js-proxy 2005-09-13 21:42:46 +00:00
Cornelius Weiß
dd2b005a7d add functionality to enter quantity on resource booking 2005-09-06 21:45:37 +00:00
Ralf Becker
9a33b1f7be fixed syntax error happening if resources is not enabled for a user or not installed 2005-07-27 16:13:42 +00:00
Cornelius Weiß
d9843f38df remove add-button in sidebox menu if user has no add rights 2005-07-08 15:26:52 +00:00
Cornelius Weiß
736ca322fe - fixed selectwidget due to id -> res_id problems 
- added book multiple functionality
- prevent booking of non-bookable resources
 2005-07-01 15:01:07 +00:00
Cornelius Weiß
c98ae36968 - change field id --> res_id due to database compability 
- add inventory number
- add storage information
- show nm-header on bottom
 2005-06-29 09:30:08 +00:00
Cornelius Weiß
003d09f27e - select-widget now works even when no user selectwidget is present (was bug) 
- some translation
 2005-06-18 08:00:03 +00:00
Ralf Becker
dd07be3040 set noclick, to keep the editor away from the internal template 2005-06-16 20:55:51 +00:00
Ralf Becker
4ac2c3ef0e new param 'max_quantity' for the calendar_resources hook and some docu 2005-06-15 09:10:19 +00:00
Cornelius Weiß
cbf0f41ad5 fixed problem with sessiondata 2005-06-13 15:14:46 +00:00
Cornelius Weiß
a2ea79e489 cleanup 2005-06-13 12:28:00 +00:00
Cornelius Weiß
8d96b0c05a - rework storage layer to so_sql 
- some bugfixes
 2005-06-13 12:21:18 +00:00
Cornelius Weiß
9cc02bf68b work on multiselection actions in index dialog 2005-06-13 09:18:06 +00:00
Cornelius Weiß
0cf4fe3274 cleanup 2005-06-12 14:36:15 +00:00
Cornelius Weiß
dc8e6a8280 cleanup 2005-06-12 13:15:52 +00:00
Cornelius Weiß
4ffaee20e7 sidebox->add resource via popup 2005-06-12 13:14:46 +00:00
Ralf Becker
46ef4a579c widget to select resources 2005-06-12 12:29:26 +00:00
Cornelius Weiß
1190d37692 select action for selected resources 2005-06-12 12:02:35 +00:00
wnz_gh05t
22b8c0511e changed id in javascript of select-dialog 2005-06-12 11:15:22 +00:00
wnz_gh05t
24bf1060a1 some changes on show-dialog 2005-06-12 10:09:12 +00:00
Ralf Becker
cf36deec92 fixed info-method 2005-06-12 10:05:39 +00:00
Cornelius Weiß
4603a28a8d use show not view 4 links 2005-06-12 09:56:49 +00:00
Cornelius Weiß
ddd3abb719 new hook for custiom calendar status on event creation 2005-06-12 09:54:29 +00:00
Cornelius Weiß
d462dd3a3f fix ;-) 2005-06-12 08:57:59 +00:00
Cornelius Weiß
1620054b81 new hook for custiom calendar status on event creation 2005-06-12 08:56:19 +00:00
Cornelius Weiß
3183e68629 new hook for custiom calendar status on event creation 2005-06-12 08:39:25 +00:00
Cornelius Weiß
dcf2a196d4 fixed rights admin 2005-06-12 08:20:44 +00:00
Cornelius Weiß
3ccbf08a09 acl 4 calendar info 2005-06-12 08:16:12 +00:00
Ralf Becker
91d42882b7 added id to returned array of info function 2005-06-12 08:01:19 +00:00
Ralf Becker
1812b42810 fixed typo calend_a_r 2005-06-12 07:15:13 +00:00
wnz_gh05t
4ec129ddc8 changes name of selectbox in select popup 2005-06-12 07:13:05 +00:00
wnz_gh05t
21f71e934c template fis 2005-06-11 20:09:41 +00:00
wnz_gh05t
901e57296a fix in ui-object::edit 2005-06-11 19:54:04 +00:00
wnz_gh05t
0eec9363ff adden js-code for select popup 2005-06-11 19:46:50 +00:00
Ralf Becker
121d9aaf05 changed calendar_resources hook 2005-06-11 19:28:57 +00:00
wnz_gh05t
82a6c07021 bugfix 2005-06-11 17:33:18 +00:00
wnz_gh05t
0956f25666 fixed bug in bo-object 2005-06-11 16:14:11 +00:00
Cornelius Weiß
c44297a5e5 header 2005-06-11 16:00:26 +00:00
Cornelius Weiß
e818b0c8be work on select function 2005-06-11 15:41:12 +00:00
Cornelius Weiß
6ccbfc8439 show_rows -> work also with ui::select 2005-06-11 15:19:47 +00:00
wnz_gh05t
9e7576880d fixed some misttakes ;-) 2005-06-11 15:03:32 +00:00
wnz_gh05t
ee90696e3b Added select function to ui-object 2005-06-11 14:58:07 +00:00
Cornelius Weiß
78a891846a calendar hook: get_calendar_info($res_id) 2005-06-11 14:32:08 +00:00
Cornelius Weiß
4f79f17397 buxfixes for emty tables 2005-06-11 14:11:57 +00:00
Cornelius Weiß
405cdee6d1 started switching so-layer to so_sql(etemplate) 
created first calender hooks
 2005-06-11 12:59:11 +00:00
Cornelius Weiß
85829662ba new acl-right: READ_Calender. 
This is made, cause there might be installations, where useres are not permittet to see how much a resource in used
etc...
 2005-06-11 08:10:22 +00:00
Ralf Becker
ec6a4600e8 - phpgw --> egw 
- some php5 stuff (clone of db object)
- partialy new db-functions
 2005-06-10 20:40:57 +00:00
Cornelius Weiß
dc7cd8cae1 fix 100% width of index-view 2005-05-24 15:40:14 +00:00
Cornelius Weiß
414d697a3d don't know how to add popups here... 2005-05-07 13:15:12 +00:00
Cornelius Weiß
b6268740b9 i'm so stupid!!! 2005-05-07 13:09:48 +00:00
Cornelius Weiß
5ce8a7b6c9 bugfix cat-admin 2005-05-07 13:08:28 +00:00
Cornelius Weiß
36fbfd7904 bugfix 2005-05-07 12:28:45 +00:00
wnz_gh05t
81db0242bb *** empty log message *** 2005-03-21 09:52:53 +00:00
Cornelius Weiß
d70fc1f6c0 cleanup 2005-03-02 08:50:39 +00:00
Cornelius Weiß
47ef43919e make add / edit a popup 2005-03-02 08:35:10 +00:00
Cornelius Weiß
9d154b8ba4 add admin section 2005-03-01 10:58:04 +00:00
Cornelius Weiß
b5bcc312fb finished work on accessories 2005-03-01 10:20:03 +00:00
Cornelius Weiß
6d020a06bd fix small bug on links 2005-03-01 08:51:16 +00:00
wnz_gh05t
08aec6c4d7 *** empty log message *** 2005-02-28 15:52:35 +00:00
Cornelius Weiß
5eac376f6e work on accessories 2005-02-28 15:19:31 +00:00
Cornelius Weiß
0c2045d5fa work on accessories 2005-02-25 13:18:40 +00:00
Cornelius Weiß
3bc277e39c make hooks nicer 2005-02-25 11:35:51 +00:00
Cornelius Weiß
8f5ccbd557 finished work on links (hopefully :-)) 2005-02-25 11:15:27 +00:00
Cornelius Weiß
9c3945a4cc work on links and accessories 2005-02-25 08:55:37 +00:00
Cornelius Weiß
088b6827a7 make links working 2005-02-24 18:24:26 +00:00
Cornelius Weiß
3ed44951a7 work on accessories and links 2005-02-24 13:10:57 +00:00
Cornelius Weiß
84fe7ae308 add sideboxmenu 2005-02-23 11:48:59 +00:00
Cornelius Weiß
4b7aa62694 handle non 4:3 pictures 2005-02-22 19:02:07 +00:00
Cornelius Weiß
a4ab0b3a73 don't translate cats 2005-02-21 15:56:21 +00:00
Cornelius Weiß
af54416695 display admin for each cat 2005-02-20 18:01:52 +00:00
Cornelius Weiß
a8f3dcc2d0 make cat list nicer 2005-02-20 17:50:39 +00:00