Commit graph

141 commits

Author SHA1 Message Date
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
ADmad
8ef2c22c29 Added "required" attribute to input element based on validation rules for field 2012-12-21 23:20:40 +05:30
mark_story
554d5794ce Merge branch 'master' into 2.3 2012-12-19 21:18:52 -05:00
ADmad
4fe85fc3c5 Fix docblock 2012-12-20 01:22:09 +05:30
ADmad
4a6ebaa07b Added Helper::$settings 2012-11-30 12:19:40 +05:30
mark_story
739982addb Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/Helper.php
2012-11-25 23:33:16 -05:00
mark_story
1f35d82c81 URL encode image/script/css/video paths.
Properly urlencode urls used in HTML attributes. This solves issues with
invalid HTML being generated when paths contain special characters.

Fixes #3395
2012-11-25 23:31:22 -05:00
mark_story
7402eea9eb Remove nested conditionals. 2012-11-25 22:53:39 -05:00
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
feda6e06a0 Reduce some code complexity. 2012-10-03 22:59:35 -04:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
dogmatic69
36314e6d37 converting if ($foo != "") to if ($foo) 2012-09-21 23:34:37 +01:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
dogmatic69
cfadc4dbb0 strict type checks and removing some duplicate count() calls by setting a variable 2012-09-14 19:26:00 +01:00
dogmatic69
cf8fccae96 converting $foo == null / $foo == false to !$foo 2012-09-14 18:26:30 +01:00
euromark
288fb120b5 added missing App::uses('Hash', 'Utility'); 2012-09-13 17:20:26 +02:00
mark_story
66b296527f Add type check to prevent errors related to Hash::get()
Fixes #3041
2012-07-23 22:33:58 -04:00
mark_story
e61f636bc7 Fix double base dir in image() with fullBase.
Fixes #2991
2012-07-03 20:48:17 -04:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Rachman Chavik
9bafc5a3bb CakeEmail: create request object before rendering
Closes #2931
2012-06-04 09:18:29 +07:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
672735d7f7 Fix Coding standard error. 2012-04-14 12:20:05 -04:00
mark_story
8eb913433f Move _attributeFormat and _minimizedAttributeFormat down.
Both properties are referenced by Helper.  The properties
should be declared there as well.

Fixes #2771
2012-04-13 07:48:09 -04:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
67743c8079 Fix missing Html escaping on string urls for assets.
Add HTML escaping for asset paths provided as strings.
Split existing tests up.

Fixes #2766
2012-04-09 21:20:11 -04:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
acccdcde1f Fix coding standard issues in View/ 2012-03-03 17:10:12 -05:00
Jose Lorenzo Rodriguez
c84e25e5b4 Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it 2012-03-01 14:56:56 -04:30
ADmad
7a42290021 $options param in Helper::assetUrl() now defaults to empty array. 2012-02-10 19:05:15 +05:30
Tigran Gabrielyan
7fe6a4d5ea Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests 2012-02-07 20:20:50 -08:00
ADmad
b6f99bc0b9 Refactored Helper::assetUrl() a bit and added test cases. 2012-02-07 03:25:59 +05:30
ADmad
22220074f2 Added HtmlHelper::video() for html5 video element generation. Extracted asset url generation code to new function Helper::assetUrl(). 2012-02-06 01:30:38 +05:30
mark_story
9562638610 Merge branch '2.0' into 2.1 2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08 Remove duplicate methods.
Fix regression where #1345 was re-introduced.
Fixes #2434
2012-01-03 21:11:45 -05:00
mark_story
23178df504 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
mark_story
2c0e030831 Move call to tagIsInvalid to FormHelper
tagIsInvalid() doesn't exist in Helper, and shouldn't be
called from that class.

Fixes #2411
2011-12-23 20:41:16 -05:00
mark_story
f0f3eb9ba9 Fix a few outstanding issues with blocks.
- Blocks left open after rendering files should trigger
  an exception.
- Fix strict errors.
- Correct doc blocks.
2011-12-17 22:23:37 -05:00
mark_story
3fe79564b5 Adding new callbacks - testing them out. 2011-12-17 22:23:35 -05:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
7d756fda81 Fix Helper::field() for Model.min
This field would be treated as a field suffix even though
it is not. Expand existing tests, and reformat some code.

Fixes #2240
2011-11-10 22:22:11 -05:00
mark_story
24fd87398d Fix issue with 0.Model.field inputs.
These inputs would be incorrectly prefixed with another Model name.
2011-10-26 23:46:15 -04:00
mark_story
c2c63d373c Fix incorrect field detection for habtm fields.
Fields on habtm models would always be treated as multiselects.
Even when there were additional fields specified.

Fixes #2153
2011-10-25 22:21:27 -04:00
Florian Krämer
b6d7766e78 Updating the @link's in the doc blocks for the views 2011-10-15 12:46:22 -04:30
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
mark_story
85b86cb282 Fix entity names for associated model date fields.
Fixes #1993
2011-09-17 12:29:21 -04:00
mark_story
1743eaa776 Fix issue with HABTM fields
habtm fields were not being correctly being detected.
2011-09-08 22:18:44 -04:00
mark_story
d6b978c0e8 Moving declaration of $fieldset
Its used in base Helper methods, so that's where the property
should live as well.
2011-09-08 20:44:33 -04:00
mark_story
fa8bdfd0dd Add fix and test for CamelBack input names.
Refs #1974
2011-09-08 20:34:41 -04:00
Juan Basso
f5a54d00dd Changed methods and attributes from private to protected. 2011-08-20 00:43:34 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -04:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
552791d74b Marked Helper::_parseAttributes() and Helper::_formatAttribute() as deprecated. 2011-07-28 23:33:33 -04:00
Juan Basso
02f290ac52 Fixed some API doc in views. 2011-07-28 22:45:47 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
22f02373c9 Moving tagIsInvalid from Helper back to FormHelper, as it is a better home for it 2011-07-13 23:49:01 -04:30
mark_story
1d0d3f80fb Fixing Helper::value() when models exist in ClassRegistry
and field values are empty.
Fixes #1817
2011-07-06 21:26:07 -04:00
mark_story
bef2e75bdf Fixing failing debugger test.
Adding doc blocks for helper properties.
2011-07-01 07:56:48 -04:00
Mark Story
89258327c6 Moving entity() and its related attributes to Helper
Removing entity() and its attributes from View.
Having that information on View allowed for unwanted side effects,
and seemed like a break of encapsulation.
2011-06-25 20:02:34 -04:00
Mark Story
1ffa7366a5 Removing now dead code. 2011-06-25 19:31:20 -04:00
Mark Story
4073584eef Fixing more failing tests.
Fixing use of properties that are going away.
2011-06-25 19:31:20 -04:00
Mark Story
25870441bc Fixing '2.name' style fields when creating multiple record forms. 2011-06-25 19:31:20 -04:00
Mark Story
3a847ae28f Updating more tests for change in Helper setEntity(). 2011-06-25 19:31:19 -04:00
Mark Story
8a8336c1b0 Starting to convert Helper::setEntity() and View::entity()
to not be nearly as complex and magic.  This also
helps reduce coupling between the helpers and Models.
2011-06-25 19:31:19 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7 According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything. 2011-05-30 22:26:42 +02:00
ADmad
4c042ae133 Adding proper visibility keywords for class functions 2011-05-29 03:31:34 +05:30
Jose Lorenzo Rodriguez
6713bb154e Making themes also CamelCased 2011-05-15 00:09:32 -04:30
Jose Lorenzo Rodriguez
bd1479f732 Fixing a bunch of tests in the View/Helper package 2011-05-09 23:33:58 -04:30
Jose Lorenzo Rodriguez
77788a965d Merge remote-tracking branch 'origin/2.0' into 2.0-plugin-loader
Conflicts:
	lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
	lib/Cake/tests/test_app/plugins/test_plugin/Model/TestPluginPost.php
	lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
2011-05-08 22:08:31 -04:30
Jose Lorenzo Rodriguez
a45758cc7d Migrating all View package tests to use the new plugin loader 2011-05-06 01:23:01 -04:30
Jose Lorenzo Rodriguez
07b84a71ab Removing unneeded assignments by reference 2011-04-29 11:49:46 -04:30
AD7six
32df3156a7 consolidate cake_error and cake_developer to simply "cake_dev"
it's a lot easier for adding new translations to think:
	is it for the end user?
		use 'cake' as the domain
	is it for the developer
		use 'cake_dev' as the domain
	is it for the console
		use 'cake_console' as the domain

also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
d2badbeb22 update language domains
no domain - the thing being translated comes from the app - so let the
user handle that
cake - end user
cake_error - error messages
2011-03-19 18:29:31 +01:00
AD7six
28eae99ecb translation changes in the view folder 2011-03-12 20:02:56 +01:00
Jose Lorenzo Rodriguez
42b3f993b9 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-01 23:04:52 -04:30
José Lorenzo Rodríguez
aa18cca1c3 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/View/Helper.php
2011-01-28 01:14:59 -04:30
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
57e6ac7eb7 Adding cast to avoind fatal error in Helper class 2010-12-21 22:05:36 -04:30
José Lorenzo Rodríguez
8e5bd76752 Fixing several errors when running the testsuite 2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
e57b3d8e74 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/View/Helper.php
2010-12-10 01:25:00 -04:30
José Lorenzo Rodríguez
1d67d1611c Micro optimizations in Helper class, as those functions are calles very often the may sum up some milliseconds 2010-12-06 22:49:15 -04:30
José Lorenzo Rodríguez
3f64844de9 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
be9bcb3627 Moving view clasess to their new home 2010-12-04 13:31:04 -04:30
Renamed from cake/libs/view/helper.php (Browse further)