Commit Graph

273 Commits

Author SHA1 Message Date
Kevin Giszewski 96d70bc1a9 Merge branch 'develop' into pr/137 2014-05-23 10:07:34 -04:00
Kevin Giszewski 264208dcc7 Update namespaces 2014-05-22 15:01:55 -04:00
Kevin Giszewski 077ab44dc8 Merge branch 'develop' into pr/107
Conflicts:
	app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
2014-05-22 14:19:03 -04:00
Kevin Giszewski 7499395807 Fix WS 2014-05-22 14:17:46 -04:00
kjac 3944da57b1 Fix the validation display
Rewrite the changes from commit 4785c85 to work with validation.
2014-05-22 19:16:26 +02:00
leekelleher 0cbbd1c93e Adds null reference checks for GetValue<T>.
Fixes #134
2014-05-22 14:29:38 +01:00
kjac 1bfab0f8a3 Optimize validation routine
Only validate the property being edited, not the entire fieldset the
property belongs to.
2014-05-21 22:49:15 +02:00
kjac c8d9b04a57 Rewrite validation
Rewrite validation to handle
1. Validation on page load
2. Validation on nested Archetypes
3. Validation of numeric property editors (check for NaN)
2014-05-19 19:49:50 +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
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 2014-05-13 12:03:50 -04:00
Kevin Giszewski 4998acb59a Missing curlies from the conflict 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
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 7615657a18 Rename Models
- Remove .Umbraco
2014-05-12 11:40:51 -04:00
Kevin Giszewski 4fff98640e Remove filter as .remove is no longer an attribute 2014-05-08 13:32:55 -04:00
Kevin Giszewski 085ff2cecf Add dropdown to add button 2014-05-08 13:32:04 -04:00
Kevin Giszewski d72a000d68 Remove Toolbar
- Fix insert index issue
2014-05-08 12:58:48 -04:00
Kevin Giszewski 2fc8845851 Merge branch 'master' into pr/115 2014-05-08 11:04:06 -04:00
leekelleher bd617162f1 Disabled "Copy Local" for 3rd-party assembly references. 2014-05-07 15:09:55 +01:00
Kevin Giszewski 688ad534f2 Check for config for label template 2014-05-06 13:00:05 -04:00
Tom Fulton 059d951a21 Don't use dropdown menu when only 1 fieldset type 2014-05-04 16:39:56 -06:00
Tom Fulton 6dc5841f31 Stylize dropdown menu 2014-05-04 16:21:19 -06:00
Tom Fulton 91fc5bbd7f Fix rows not being added in correct position 2014-05-04 15:59:01 -06:00
Tom Fulton 3742147cf7 Merge branch 'master' into feature/add-dropdown
Conflicts:
	app/views/archetype.html
2014-05-04 15:58:00 -06:00
Kevin Giszewski b7a8f5f581 Add try/catch with logging to prop converters 2014-05-02 09:20:59 -04:00
Kevin Giszewski 6ea44c271d Use a count on the add button rather than checking flag 2014-04-30 10:00:15 -04:00
Tom Fulton 848d25a156 Show "remove" button when MaxFieldsets = 1 and Multiple Fieldset Types
... so the user can switch types (remove/add) when only a single row.

We check for Multiple Fieldset Types as well, because we don't want to show a "remove" button when there's only one type allowed (presumably).
2014-04-29 19:52:23 -06:00
Tom Fulton b4fc3e1cd3 Persist without formatting/whitespace 2014-04-29 18:34:25 -06:00
Tom Fulton 0547c4c07e Ensure we only save the "cleaned" model to the DB
* Extract the model cleaning logic to a method for re-use
* Call cleaning method from ConvertEditorToDb  (we were only calling on ConvertDbToString (cache))
* Update ConvertDbToEditor to route through new deserialization helper, so that it gets the "virtual" properties it needs that were lost in the cleaning
2014-04-29 18:18:14 -06:00
Kevin Giszewski 86f2f180bf Fix defaultPreValue import
- Remove MNTP hack
2014-04-29 16:23:55 -04:00
Kevin Giszewski 62a9ff05b9 Hide the Add button when multiple fieldsets enabled 2014-04-29 14:35:48 -04:00
Kevin Giszewski ce05dbb845 Remove logging 2014-04-29 14:25:34 -04:00
Kevin Giszewski 8ce8454620 Add a hack to make the MNTP multipicker work 2014-04-29 14:23:58 -04:00