Commit Graph

5269 Commits

Author SHA1 Message Date
alexdba 8ef66bb0f4 Option to limit inline display of linked tables
Added a new option to smartgrid: "max_linked_inline".
When set to a value greater than zero, it will limit the inline display of linked tables (in grid, edit and details).
In case there are a number of linked tables greater than the setting, the links will be displayed in a select list menu.
2014-08-05 15:20:01 -03:00
Leonel Câmara 59bbe7cddd minor - removed unnecessary dict calls 2014-08-05 18:32:32 +01:00
Leonel Câmara c9c054e72b refactored backward compatibility on formstyles to use try except instead of inspecting arguments, should make the new style faster as it never raises the exception 2014-08-05 18:30:20 +01:00
Leonel Câmara 0f55d43a11 Removed unecessary dict call in get_workers 2014-08-05 15:37:10 +01:00
Leonel Câmara ba82c0d86b Merge branch 'master' of git://github.com/web2py/web2py 2014-08-05 15:35:18 +01:00
Leonel Câmara 5c0693b175 Further refactored SQLiteAdapter calling the super method instead of duplicating the code 2014-08-05 10:53:40 +01:00
niphlod cb6f2ca302 task dependencies, a little bit of refactoring 2014-08-04 21:42:11 +02:00
Leonel Câmara b788e8b493 minor - Slight optimization use tablename directly instead of table._tablename 2014-08-02 10:57:02 +01:00
Leonel Câmara 444a09b0b2 Refactored BaseAdapter delete method - Special case code for sqlite and spatialite should not be in the BaseAdapter it should be in SQLiteAdapter, this should also provide a negligible performance boost in delete operations for most adapters including SQLiteAdapter. 2014-08-02 10:52:47 +01:00
Leonel Câmara f0691a64ea typo in a comment 2014-08-02 10:38:48 +01:00
omartrinidad e29804eeb4 Changed a condition in order to not show None if there is not error 2014-08-01 09:47:46 -05:00
mdipierro eff9b2d174 Merge pull request #474 from leonelcamara/master
Added an optional render argument to as_trees that if True causes it to ...
2014-08-01 01:43:36 -05:00
mdipierro 91ced9007e Merge pull request #473 from omartrinidad/master
Deleted unnecessary variable
2014-08-01 01:37:35 -05:00
Leonel Câmara c73cc084ad Merge branch 'master' of git://github.com/web2py/web2py
Conflicts:
	applications/admin/languages/pt.py
	gluon/dal.py
2014-07-29 20:19:26 +01:00
Leonel Câmara 8d8095b1f5 Added fix - you cannot concatenate lists with tuples and sets and it was possible that this would happen 2014-07-29 19:39:14 +01:00
Leonel Câmara 757fb934d5 Fixed a bug where as_list was setting the compact value for the rows permanently instead of only temporarily while processing the rows. 2014-07-29 18:56:45 +01:00
Leonel Câmara 1ee8d3cb97 Added an optional render argument to as_trees that if true causes it to render the rows before building the tree 2014-07-29 18:01:11 +01:00
mdipierro bd44a42c89 allow arbistrary params to formstyle=style(placeholder=True, errors='down'), thanks André Kablu 2014-07-28 23:29:26 -05:00
mdipierro 024912bda1 fixed conflict between GAE and 2-factor authentication 2014-07-28 22:01:48 -05:00
Omar Trinidad Gutiérrez Méndez dec69b8252 Deleted unnecessary variable
before:
        iso_format = iso_format = {'_data-w2p_datetime_format' : '%Y-%m-%d %H:%M:%S'}

now:
        iso_format = {'_data-w2p_datetime_format' : '%Y-%m-%d %H:%M:%S'}
2014-07-28 11:35:56 -05:00
mdipierro 29303488ab support for Oracle REGEXP_LIKE, thanks Alexander Rasin 2014-07-28 00:21:45 -05:00
mdipierro 0201007e2c ldap CA support, thanks Maggs and Shane 2014-07-27 11:15:37 -05:00
mdipierro 7b2b8155f9 Merge pull request #469 from abastardi/issue/unique_validator
Fix default validator when unique=True
2014-07-10 02:07:46 -05:00
mdipierro ad2ca992aa Merge pull request #467 from ilvalle/fix_show_if
fix show_if with belongs
2014-07-10 02:06:40 -05:00
abastardi d2563c434b Fix default validator when unique=True
Append the IS_NOT_IN_DB validator so it is applied to the final value after any previous validators may have altered the original value.
2014-07-09 13:51:26 -04:00
ilvalle 609a931f91 always appends IS_NOT_IN_DB 2014-07-09 17:05:36 +02:00
mdipierro fcadaa981d settings is_gae in autocomplete 2014-07-09 07:07:26 -05:00
ilvalle e7208c6569 fix unique validator with date/time fields 2014-07-08 23:14:28 +02:00
ilvalle f2bc3cca36 fix show_if with belongs 2014-07-08 12:22:31 +02:00
mdipierro 27eb797e2b Merge pull request #465 from omartrinidad/patch-1
Update sqlhtml.py
2014-07-04 01:46:17 -05:00
mdipierro 5d3c915c61 added parent links 2014-07-03 12:22:55 -05:00
mdipierro 1606c938a7 better handling of uploads in hypermedia.py 2014-07-03 11:56:15 -05:00
mdipierro 9a6f0b59ad fixed errors reporting in collection+json 2014-07-02 18:35:25 -05:00
mdipierro 55016cbd4d fixed guessable CSRF token when detect_record_change, thanks Stephen Röttger 2014-07-02 08:27:02 -05:00
mdipierro eec39aeeec smarter upload of binary data 2014-07-02 07:26:16 -05:00
mdipierro bc1b4ad03a fixed some problems with collection+json 2014-07-02 03:01:30 -05:00
Omar Trinidad Gutiérrez Méndez 13d4d892b7 Update sqlhtml.py
Improved readability in code
2014-07-01 16:24:40 -05:00
mdipierro b61e8c6132 allow id in email msg 2014-06-25 10:52:36 -05:00
mdipierro 22044768cb Merge pull request #464 from cccaballero/master
Added dict based meta generation
2014-06-25 01:02:07 -05:00
mdipierro d712d3b83c fixed redirect 2014-06-24 12:46:17 -05:00
cccaballero 1ecf36a027 Added dict based meta generation 2014-06-24 09:49:46 -04:00
mdipierro bf52e012a7 rules->policies in hypermedia 2014-06-23 01:03:17 -05:00
mdipierro 7bb8735f2f Hypermedia API and Collection+JSON 2014-06-22 14:57:35 -05:00
mdipierro 1ca5e5524e fixed possible bug in dal 2014-06-19 17:17:29 -05:00
mdipierro 21bdf114b4 Merge pull request #462 from niphlod/fix/scheduler_disabled
a DISABLED worker shouldn't resume after completing a task
2014-06-15 22:20:17 -05:00
niphlod d2c9f510bc if a worker is DISABLED while processing a task, it shouldn't resume after finishing it 2014-06-15 17:40:08 +02:00
niphlod 84cf736b63 removed leftover print 2014-06-15 15:15:33 +02:00
Fran Boon c163e1c776 Remove duplicate imports/unused variable 2014-06-14 23:29:09 +05:30
mdipierro 255dd9777d fixed typo in recent commit 2014-06-14 10:06:13 -05:00
mdipierro 8b8baf10a3 fixed issue 1942, redirect in federated login security check 2014-06-13 22:24:57 -05:00