Commit Graph

61 Commits

Author SHA1 Message Date
kjac 1cc0586c75 Support alternative property in label template
Allow fieldset label templates to contain alternative/fallback property
aliases and/or functions by seperating with "|" - e.g.
{{title|myFunction(text)}}
2015-01-10 11:16:00 +01:00
Kevin Giszewski 774ba46e13 Flip-flop scope and fieldset 2014-11-02 12:56:07 +01:00
Kevin Giszewski c841813a74 decouple entityResource from the function call 2014-08-13 11:15:29 -04:00
Kevin Giszewski e200c22244 More caching 2014-08-12 19:15:08 -04:00
Kevin Giszewski 07125bae84 Add ability to pass function as template 2014-08-12 16:56:23 -04:00
kjac 8332a841eb Implement #165 - enable/disable fieldsets 2014-06-28 12:42:36 +02:00
Kevin Giszewski c953f12412 Merge branch 'pr/157' into pr/164 2014-06-26 15:58:31 -04:00
kjac 601f2c0d81 Fix issue #162 + improve nested validation highlighting
The fieldset.isValid property isn't necessarily initialized when the
view looks for it to determine fieldset validity. I've introduced a
validation method that counters this problem.
The validation method also ensures that any validation errors in nested
Archetypes are highlighted on the parent/root Archetype
2014-06-26 14:58:55 +02:00
Tom Fulton aac015dc0b Refactor property aliases for uniqueness
Old: archetype-property-<umbracoPropertyAlias>-<fieldsetIndex>-<propertyIndex>
New: archetype-property-<umbracoPropertyAlias>-<archetypePropertyAlias>-<fieldsetIndex>

Basically, this adds the archetypePropertyAlias into the mix, to fix a case where you might have the same Archetype nested on a host Archetype twice  (ie box 1 links, box 2 links within the same Archetype - there was no uniqueness)

It also adds in the Property Alias in place of the Property "Index" (unintended side effect, but seems cool :))
2014-06-23 20:58:42 -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
Kevin Giszewski 9829ab796a Remove setDirty()
- Not sure how it made it in
2014-05-12 19:09:29 +02:00
Kevin Giszewski 932f098837 Expose current form to nested Archetypes 2014-05-12 19:09:28 +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 085ff2cecf Add dropdown to add button 2014-05-08 13:32:04 -04:00
Kevin Giszewski 688ad534f2 Check for config for label template 2014-05-06 13:00:05 -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
Kevin Giszewski 62a9ff05b9 Hide the Add button when multiple fieldsets enabled 2014-04-29 14:35:48 -04:00
Kevin Giszewski d13a5b1b86 Remove RenderModel
- Use server side converters for model cleanup
2014-04-29 12:31:02 -04:00
Andrey Shchekin b9a0852c4f Added a "start with Add button" option that shows "+ Add" instead of default fieldset. 2014-04-02 14:26:35 +13:00
Tom Fulton 9203718a95 Merge pull request #84 from imulus/feature/hide-label
Add "Hide Label" option for full-width Archetypes
2014-03-17 18:13:44 -06:00
Tom Fulton 363e614349 Allow single rows to be collapsed
Previously, you couldn't collapse a single row by itself, it was always expanded.  Now you can collapse it, but it's still expanded on the initial page load.
2014-03-14 22:29:00 -06:00
Tom Fulton 35ea62dff1 Add "Hide Label" option for full-width Archetypes 2014-03-14 22:02:28 -06:00
Tom Fulton 8e71e5b66e Merge pull request #76 from imulus/feature/bug-fixes-kg
Bug fixes
2014-03-12 16:10:36 -06:00
Kevin Giszewski fa54294d74 Bug fixes for:
- #75
2014-03-12 08:12:22 -04:00
Tom Fulton d37ee132bc Update adding rows to adhere to new Enable Collapsing option 2014-03-06 12:15:51 -07:00
Tom Fulton 45d7db0239 Add missing dependency 2014-03-06 12:12:40 -07:00
Tom Fulton 5865b47482 Merge branch 'feature/allow-collapsing' into develop
Conflicts:
	app/controllers/controller.js
2014-03-06 12:05:34 -07:00
Tom Fulton 7505de1cf1 Add hack to workaround U4-4181 (Firefox can't click any fields)
...in lieu of "proper" fix in Umbraco.
2014-03-02 19:47:21 -07:00
Tom Fulton 67c118066b Merge branch 'develop' into feature/allow-collapsing
Conflicts:
	app/views/archetype.html
2014-03-02 00:41:20 -07:00
Tom Fulton f49159d2d0 Add option to make "collapsing" feature optional
* View: Prevent collapse/expand depending on config option, add class when enabled
* Config: Add option to view, set default to enabled for new datatypes
* CSS: Revert to normal cursor when collapsing disabled

* Note, this is a breaking change - you'll need set `Enable Collapsing?` to `true` on any existing Archetypes to retain the behavior.
2014-03-02 00:38:34 -07:00
Kevin Giszewski 10d3dd76ed Fix a situation where null were getting into the model on save. 2014-02-26 09:39:02 -05:00
Kevin Giszewski a8d028fcbf Merge branch 'feature/validation' into develop 2014-02-03 08:24:21 -05:00
Kevin Giszewski 2d2658d8f4 Merge branch 'feature/default-fieldset-title' into develop 2014-02-03 08:22:39 -05:00
Kevin Giszewski 34d2420c75 Refactor a few things 2014-02-02 22:58:04 -05:00
Kevin Giszewski 139c22c560 WIP 2014-02-02 16:51:32 -05:00
Kevin Giszewski 50f4e43cf6 Fix typo in the comments 2014-02-01 20:21:55 -05:00
Kevin Giszewski 5ad2c91700 Bugfixes
- Cleanout model properties if no longer in the config
- Test for form existence on validation
2014-02-01 20:20:09 -05:00
Kevin Giszewski 6dc745f31d Remove dependency to $interpolate 2014-02-01 18:40:57 -05:00
Tom Fulton a1f7d94ece Default fieldset title when empty 2014-01-31 20:56:40 -07:00
Kevin Giszewski 852510fd70 Avoid having the fieldset default to error when added 2014-01-31 09:53:35 -05:00
Kevin Giszewski 12428c71a9 Use JSON.parse in favor of eval() 2014-01-19 08:51:49 -05:00
Kevin Giszewski ffc876eed2 Update comments 2014-01-19 08:14:27 -05:00
Kevin Giszewski 41c43f1b7e Remove function no longer used 2014-01-19 08:14:19 -05:00
Kevin Giszewski d46ae5b993 Fix validation bug, rename labelExpression, change error style 2014-01-16 19:43:15 -05:00
Kevin Giszewski d80f828b29 Fix validation.requiredAliases ini error 2014-01-16 14:43:46 -05:00
Kevin Giszewski 847c42238b Remove Imulus References from Archetype except for C# and Property Alias
- Default to only one fieldset
- Move all other options to 'advanced'
2014-01-16 14:23:02 -05:00
Kevin Giszewski 758b479f2e Merge branch 'feature/fieldset-label-expressions' into feature/configUI 2014-01-16 13:47:19 -05:00
Kevin Giszewski a8cb0613cf Rename renderItem to renderFieldset 2014-01-16 13:42:08 -05:00