brekke 01/08/19 19:55:11
Modified: build Tag: T_2_1_BRANCH build.xml
src/java/org/apache/turbine/flux/modules/actions/permission
Tag: T_2_1_BRANCH FluxPermissionAction.java
src/templates/screens/permission Tag: T_2_1_BRANCH
FluxPermissionForm.vm
src/templates/screens/user Tag: T_2_1_BRANCH FluxUserForm.vm
FluxUserList.vm FluxUserRoleForm.vm
Log:
o template directories are included in jar
o Updated the permission action and template to work properly when renaming.
o Password contents are no longer displayed
o Minor formatting of color/style to use skin.
Revision Changes Path
No revision
No revision
1.3.2.1 +5 -4 jakarta-turbine-flux/build/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/build/Attic/build.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- build.xml 2001/05/03 03:49:32 1.3
+++ build.xml 2001/08/20 02:55:11 1.3.2.1
@@ -29,10 +29,10 @@
<property file="${project.props}"/>
<path id="classpath">
- <fileset dir="../../jakarta-turbine/bin">
+ <fileset dir="../../jakarta-turbine-2/bin">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="../../jakarta-turbine/lib">
+ <fileset dir="../../jakarta-turbine-2/lib">
<include name="**/*.jar"/>
</fileset>
</path>
@@ -50,7 +50,7 @@
<target name="compile"
depends="prepare"
description="--> compiles the source code">
-
+
<javac srcdir="${java.src.dir}"
destdir="${build.dest}"
debug="${debug}"
@@ -66,12 +66,13 @@
<target name="jar"
depends="compile"
description="--> generates the .jar file">
-
<jar jarfile="${build.dir}/${project}.jar">
<fileset dir="${build.dest}"/>
<fileset dir="${src.dir}">
<exclude name="**/java/**"/>
+ <exclude name="**/templates/**"/>
</fileset>
+ <fileset dir="${src.dir}/templates"/>
</jar>
</target>
No revision
No revision
1.2.2.1 +5 -5
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/permission/FluxPermissionAction.java
Index: FluxPermissionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/permission/FluxPermissionAction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- FluxPermissionAction.java 2001/04/15 20:12:19 1.2
+++ FluxPermissionAction.java 2001/08/20 02:55:11 1.2.2.1
@@ -112,13 +112,11 @@
throws Exception
{
Permission permission = TurbineSecurity.getPermission(
- data.getParameters().getString("name"));
-
- data.getParameters().setProperties(permission);
-
+ data.getParameters().getString("oldname"));
try
{
- TurbineSecurity.savePermission(permission);
+ TurbineSecurity.renamePermission(permission,
+
data.getParameters().getString("name"));
}
catch (UnknownEntityException uee)
{
@@ -127,6 +125,7 @@
* think we should use the an id so that
* this can't happen.
*/
+ org.apache.turbine.util.Log.error(uee);
}
}
@@ -151,6 +150,7 @@
* think we should use the an id so that
* this can't happen.
*/
+ org.apache.turbine.util.Log.error(uee);
}
}
No revision
No revision
1.2.2.1 +2 -1
jakarta-turbine-flux/src/templates/screens/permission/FluxPermissionForm.vm
Index: FluxPermissionForm.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/templates/screens/permission/FluxPermissionForm.vm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- FluxPermissionForm.vm 2001/05/22 14:51:46 1.2
+++ FluxPermissionForm.vm 2001/08/20 02:55:11 1.2.2.1
@@ -1,7 +1,7 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
-@version $Id: FluxPermissionForm.vm,v 1.2 2001/05/22 14:51:46 jvanzyl Exp $
+@version $Id: FluxPermissionForm.vm,v 1.2.2.1 2001/08/20 02:55:11 brekke Exp $
*#
@@ -43,6 +43,7 @@
<font face="$ui.sansSerifFonts">
#if ($flux.Mode == "modify")
+ <input type="hidden" name="oldname" value="$flux.Permission.Name"/>
<input type="submit" name="eventSubmit_doUpdate" value="Update
Permission"/>
#elseif ($flux.Mode == "delete")
<input type="submit" name="eventSubmit_doDelete" value="Confirm
Deletion"/>
No revision
No revision
1.3.2.1 +2 -2 jakarta-turbine-flux/src/templates/screens/user/FluxUserForm.vm
Index: FluxUserForm.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/templates/screens/user/FluxUserForm.vm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- FluxUserForm.vm 2001/05/22 14:53:01 1.3
+++ FluxUserForm.vm 2001/08/20 02:55:11 1.3.2.1
@@ -3,7 +3,7 @@
Display the details of a user.
@author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
-@version $Id: FluxUserForm.vm,v 1.3 2001/05/22 14:53:01 jvanzyl Exp $
+@version $Id: FluxUserForm.vm,v 1.3.2.1 2001/08/20 02:55:11 brekke Exp $
*#
@@ -36,7 +36,7 @@
#formCell ("Username" "username" $!user.UserName)
</tr>
<tr>
- #formCell ("Password" "password" $!user.Password)
+ #formPasswordCell ("Password" "password" "")
</tr>
<tr>
#formCell ("First Name" "firstname" $!user.FirstName)
1.2.2.1 +2 -3 jakarta-turbine-flux/src/templates/screens/user/FluxUserList.vm
Index: FluxUserList.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/templates/screens/user/FluxUserList.vm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- FluxUserList.vm 2001/05/22 14:53:08 1.2
+++ FluxUserList.vm 2001/08/20 02:55:11 1.2.2.1
@@ -1,14 +1,14 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
-@version $Id: FluxUserList.vm,v 1.2 2001/05/22 14:53:08 jvanzyl Exp $
+@version $Id: FluxUserList.vm,v 1.2.2.1 2001/08/20 02:55:11 brekke Exp $
*#
$page.setTitle("User Administration")
$page.setBgColor($ui.bgcolor)
-#set ( $headings = ["Username","Password","First Name", "Last Name", "Email"] )
+#set ( $headings = ["Username","First Name", "Last Name", "Email"] )
<table>
@@ -48,7 +48,6 @@
#foreach ($user in $flux.Users)
<tr>
#entryCell ($!user.UserName)
- #entryCell ($!user.Password)
#entryCell ($!user.FirstName)
#entryCell ($!user.LastName)
#entryCell ("<a href=mailto:$!user.Email>$!user.Email</a>")
1.2.2.1 +3 -11
jakarta-turbine-flux/src/templates/screens/user/FluxUserRoleForm.vm
Index: FluxUserRoleForm.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/templates/screens/user/FluxUserRoleForm.vm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- FluxUserRoleForm.vm 2001/05/22 14:53:13 1.2
+++ FluxUserRoleForm.vm 2001/08/20 02:55:11 1.2.2.1
@@ -1,7 +1,7 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
-@version $Id: FluxUserRoleForm.vm,v 1.2 2001/05/22 14:53:13 jvanzyl Exp $
+@version $Id: FluxUserRoleForm.vm,v 1.2.2.1 2001/08/20 02:55:11 brekke Exp $
*#
@@ -24,11 +24,7 @@
</td>
#foreach ($role in $flux.Roles)
- <td bgcolor="$ui.labelColor">
- <font face="$ui.sansSerifFonts">
- <b>$role.Name</b>
- </font>
- </td>
+ #formLabel($role.Name)
#end
</tr>
@@ -37,11 +33,7 @@
#foreach ($group in $flux.Groups)
<tr>
- <td bgcolor="$ui.labelColor">
- <font face="$ui.sansSerifFonts">
- <b>$group.Name</b>
- </font>
- </td>
+ #formLabel($group.Name)
#foreach ($role in $flux.Roles)
#if ($acl.hasRole($role, $group))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
