Commit Graph

401 Commits

Author SHA1 Message Date
kjac d07c16160a Merge remote-tracking branch 'upstream/master' 2014-06-16 16:42:25 +02:00
Kevin Giszewski 7cdcb940bd Merge pull request #144 from imulus/develop
Develop
2014-06-14 18:25:35 -04:00
Kevin Giszewski 75e0ac5d6d Merge pull request #139 from imulus/fix/133
Send ContentType when using ValueConverters
2014-06-14 18:22:37 -04:00
Kevin Giszewski ba6921fdb9 Update README.md 2014-05-29 17:50:43 -04:00
kjac aafeebfc62 Merge remote-tracking branch 'upstream/master' 2014-05-29 11:16:01 +02:00
Tom Fulton 8624617ad4 Merge branch 'master' into fix/133 2014-05-27 15:03:02 -06:00
Tom Fulton e46e5c279f Merge pull request #136 from leekelleher/feature/issues/134
Adds null reference checks for `GetValue<T>`.
2014-05-27 15:01:57 -06:00
Tom Fulton a9dc79e4ff Ensure new HostContentType isn't persisted 2014-05-27 15:01:21 -06:00
Tom Fulton 485c6cb6a1 When using ValueConverters, pass along the Content Type - fixes #133
* Add new property HostContentType to make Properties aware of their content type
* Adjust Dummy PropertyType to include the Content Type
* Pass in Content Type from ValueConverter to Deserialization helper through new optional parameter
* Populate the property's HostContentType via RetrieveAdditionalProperties
* Make sure HostContentType isn't persisted

Notes: In some cases, the Umbraco Core looks for pt.ContentType.Alias, which didn't exist previously in our Dummy PropertyType.  This would also potentially cause an error if any PVC's do the same.

To fix we now keep track of the Content Type that the Archetype exists on (determined in the ArchetypeValueConverter), and pass this along to our Dummy PropertyType (and thus to PVCs)

Note we made the hostContentType an optional parameter as there's some cases where we won't know the content type (ie ConvertDbToEditor).  This (shouldn't?) be an issue as these cases should never have a reason to call GetValue.
2014-05-27 14:31:23 -06:00
Kevin Giszewski 8e7eda9276 Merge branch 'master' into develop 2014-05-23 16:24:10 -04:00
leekelleher 0cbbd1c93e Adds null reference checks for GetValue<T>.
Fixes #134
2014-05-22 14:29:38 +01:00
kjac 537abea717 Merge remote-tracking branch 'upstream/master' 2014-05-20 07:13:54 +02:00
Kevin Giszewski 32d0d199a3 Add/move dynamic classes for targeting of custom behavior 2014-05-16 13:44:25 +02:00
kjac 715776771a Fix deserialization of RegEx enabled properties
Fix type mismatch for RegEx (introduced in 6e50301 - my bad, sorry)
2014-05-16 13:44:24 +02:00
Kevin Giszewski 4785c85b84 Add/move dynamic classes for targeting of custom behavior 2014-05-15 17:24:34 -04:00
Kevin Giszewski 43a7202194 Merge pull request #128 from kjac/RegEx-model-fix
Fix deserialization of RegEx enabled properties
2014-05-14 10:01:37 -04:00
kjac 9a21ab0ef4 Fix deserialization of RegEx enabled properties
Fix type mismatch for RegEx (introduced in 6e50301 - my bad, sorry)
2014-05-13 22:11:53 +02:00
Kevin Giszewski 46613bbc01 Fix bug with Add button v1.0.1-beta 2014-05-13 12:03:50 -04:00
Kevin Giszewski 4998acb59a Missing curlies from the conflict v1.0-beta 2014-05-13 11:15:33 -04:00
Kevin Giszewski bc58078eec Merge branch 'develop'
Conflicts:
	app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
	app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePropertyModel.cs
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-05-13 11:15:13 -04:00
Kevin Giszewski d1d95aebe7 Merge branch 'pr/126' into develop 2014-05-13 11:01:56 -04:00
kjac 1c9bce8b66 Explicitly set form as dirty on row changes
Fix issue #123. Explicitly call $setDirty() on the PE form when
reordering or removing rows, thus ensuring the editor will be prompted
to discard changes if navigating away before saving.
2014-05-12 21:51:19 +02:00
kjac 8d3e3aeb0a Stop Umbraco from asking to discard changes
By calling ngModelCtrl.$setViewValue() only when there's actually a
change in the value, we keep Umbraco from prompting to discard changes
immediately after all changes have been saved (see issue #121 for more
details).
2014-05-12 21:30:08 +02:00
kjac a58c0154c9 Merge remote-tracking branch 'upstream/master' 2014-05-12 19:11:08 +02:00
Kevin Giszewski 9829ab796a Remove setDirty()
- Not sure how it made it in
2014-05-12 19:09:29 +02:00
Kevin Giszewski 75080b0e2d Rename Model Files 2014-05-12 19:09:28 +02:00
Kevin Giszewski 932f098837 Expose current form to nested Archetypes 2014-05-12 19:09:28 +02:00
kjac 6e50301da5 Issue #116: Add RegEx validation support
Add RegEx validation for the individual properties in a fieldset as
proposed in issue #116
2014-05-12 19:09:27 +02:00
kjac 448bbe26f0 Update fix for issue #121 + fix issue #123
Use the built-in dirty state to handle row changes instead of the custom
state variable introduced in the previous commit.
Additionally this solves issue #123 by setting the dirty state when rows
are removed or sorted.
2014-05-12 19:09:26 +02:00
kjac 7c3c0e041d Fix issue #121
Stop prompting the editor to save unsaved changes after saving.
2014-05-12 19:09:26 +02:00
Kevin Giszewski 3b2559c37d Update folder name in sln 2014-05-12 19:09:25 +02:00
Kevin Giszewski 2cc4fd711a Update folder name 2014-05-12 19:09:24 +02:00
Kevin Giszewski d5038a52d1 Add in DatabaseSizer
- Temp DLL to not be included in dist
2014-05-12 19:09:24 +02:00
Kevin Giszewski d4cf60d5f3 Update packages to v7.1.2
- Also last commit
2014-05-12 19:09:23 +02:00
Kevin Giszewski 09a3172c80 Merge in 2014-05-12 19:09:22 +02:00
Kevin Giszewski 2bf2e5f91a Update naming scheme 2014-05-12 19:09:22 +02:00
Kevin Giszewski d09831b547 Merge pull request #125 from imulus/develop
Develop
2014-05-12 12:54:47 -04:00
Kevin Giszewski db82bd8013 Remove setDirty()
- Not sure how it made it in
2014-05-12 12:52:24 -04:00
Kevin Giszewski 4014583ade Merge branch 'pr/124' into develop 2014-05-12 12:45:45 -04:00
Kevin Giszewski 9a0e40b489 Rename Model Files 2014-05-12 12:44:18 -04:00
Kevin Giszewski 5c60c109d5 Expose current form to nested Archetypes 2014-05-12 12:43:38 -04:00
Kevin Giszewski 7615657a18 Rename Models
- Remove .Umbraco
2014-05-12 11:40:51 -04:00
Kevin Giszewski bdb3655418 Merge branch 'develop' into pr/124 2014-05-12 10:50:41 -04:00
Kevin Giszewski 0d766c1ad9 Merge branch 'develop' into pr/122 2014-05-12 09:55:54 -04:00
kjac e2c7e9b0ef Issue #116: Add RegEx validation support
Add RegEx validation for the individual properties in a fieldset as
proposed in issue #116
2014-05-11 10:39:12 +02:00
kjac 62964dcfae Update fix for issue #121 + fix issue #123
Use the built-in dirty state to handle row changes instead of the custom
state variable introduced in the previous commit.
Additionally this solves issue #123 by setting the dirty state when rows
are removed or sorted.
2014-05-10 22:29:56 +02:00
kjac a48033874a Fix issue #121
Stop prompting the editor to save unsaved changes after saving.
2014-05-10 17:25:16 +02:00
Kevin Giszewski ecb933d13a Update folder name in sln 2014-05-09 12:06:18 -04:00
Kevin Giszewski 45ccf6e06d Update folder name 2014-05-09 12:05:43 -04:00
Kevin Giszewski b0118f4bdb Add in DatabaseSizer
- Temp DLL to not be included in dist
2014-05-09 12:04:23 -04:00