You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/09/12 08:59:23 UTC
git commit: ISIS-883, ISIS-885,
ISIS-846: reverting changes to todoapp made while
implementing/testing this feature.
Repository: isis
Updated Branches:
refs/heads/master 48694d8e6 -> c1af7b4a3
ISIS-883, ISIS-885, ISIS-846: reverting changes to todoapp made while implementing/testing this feature.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c1af7b4a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c1af7b4a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c1af7b4a
Branch: refs/heads/master
Commit: c1af7b4a302d0515fc9787a28d04c366cb7763ac
Parents: 48694d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 12 07:48:09 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 12 07:54:45 2014 +0100
----------------------------------------------------------------------
.../todoapp/dom/src/main/java/dom/todo/ToDoItems.java | 2 --
.../todoapp/webapp/src/main/resources/webapp/realm1.ini | 8 +++-----
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c1af7b4a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
index 753cb59..2cb6c9f 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
@@ -124,8 +124,6 @@ public class ToDoItems {
//endregion
//region > newToDo (action)
- @Bookmarkable
- @ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "5")
public ToDoItem newToDo(
final @RegEx(validation = "\\w[@&:\\-\\,\\.\\+ \\w]*") @Named("Description") String description,
http://git-wip-us.apache.org/repos/asf/isis/blob/c1af7b4a/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini b/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
index ea15aae..6483045 100644
--- a/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
+++ b/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
@@ -64,8 +64,7 @@ guest = guest, readonly_role
# perm in format: packageName:className:memberName:r,w
#
-# the role/perm mappings for realm1 and realm2 are "coincidentally" the same.
-# But if using the IsisLdapRealm, it could be pointed at an ini file such as this in
+# If using the IsisLdapRealm, it could be pointed at an ini file such as this in
# order to share role/perm mappings.
#
@@ -74,9 +73,8 @@ guest = guest, readonly_role
readonly_role = *:ToDoItems:notYetComplete:*,\
*:ToDoItems:complete:*,\
*:ToDoItems:allToDos:*,\
- *:ToDoAppDashboard:*:*
-
-# *:ToDoItem:*:r,\
+ *:ToDoAppDashboard:*:*,\
+ *:ToDoItem:*:r
user_role = *:ToDoItems:*:*,\
*:ToDoItem:*:*,\