Author: ktlili
Date: Tue Sep 4 16:08:29 2007
New Revision: 112
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D112&repname=
=3Dtimereporting
Log:
- timesheet new features
Modified:
trunk/war/src/webapp/WEB-INF/applicationContext.xml
trunk/war/src/webapp/WEB-INF/etc/Methods.properties
Modified: trunk/war/src/webapp/WEB-INF/applicationContext.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
WEB-INF/applicationContext.xml&rev=3D112&repname=3Dtimereporting
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/webapp/WEB-INF/applicationContext.xml (original)
+++ trunk/war/src/webapp/WEB-INF/applicationContext.xml Tue Sep 4 16:08:29=
2007
@@ -4,18 +4,22 @@
<beans>
<bean id=3D"dataSource" class=3D"org.apache.commons.dbcp.BasicDataSour=
ce">
<property name=3D"driverClassName">
+ <!--<value>org.hsqldb.jdbcDriver</value>-->
<value>com.mysql.jdbc.Driver</value>
<!--value>org.postgresql.Driver</value-->
</property>
<property name=3D"url">
+ <!--<value>jdbc:hsqldb:mem:timereporting;shutdown=3Dtrue</valu=
e>-->
<value>jdbc:mysql://localhost:3306/timereporting</value>
<!--value>jdbc:postgresql://localhost:5432/timereporting</valu=
e-->
</property>
<property name=3D"username">
+ <!--<value>sa</value>-->
<value>timereporting</value>
<!--value>postgres</value-->
</property>
<property name=3D"password">
+ <!--<value></value>-->
<value>timereporting</value>
<!--value>postgres</value-->
</property>
@@ -36,6 +40,11 @@
<value>hibernate/User.hbm.xml</value>
<value>hibernate/Validation.hbm.xml</value>
<value>hibernate/EmployeeHourPrice.hbm.xml</value>
+ <value>hibernate/GlobalLabel.hbm.xml</value>
+ <value>hibernate/ProjectLabel.hbm.xml</value>
+ <value>hibernate/EmployeePriceCurrency.hbm.xml</value>
+ <value>hibernate/EmployeePrice.hbm.xml</value>
+ <value>hibernate/Currency.hbm.xml</value>
</list>
</property>
<property name=3D"hibernateProperties">
Modified: trunk/war/src/webapp/WEB-INF/etc/Methods.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
WEB-INF/etc/Methods.properties&rev=3D112&repname=3Dtimereporting
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/webapp/WEB-INF/etc/Methods.properties (original)
+++ trunk/war/src/webapp/WEB-INF/etc/Methods.properties Tue Sep 4 16:08:29=
2007
@@ -104,6 +104,7 @@
remove_project =3D removeProject
modify_project =3D modifyProject
assign_project =3D assignProject
+search_projects =3D searchProjects
unassign_project =3D unassignProject
new_period =3D newPeriodForm
create_period =3D createPeriod
@@ -133,6 +134,24 @@
manage_users =3D manageUsers
show_users =3D manageUsers
=
+manage_globallabel =3D manageGlobalLabel
+create_globallabel =3D createGlobalLabel
+update_globallabel =3D updateGlobalLabel
+delete_globallabel =3D deleteGlobalLabel
+view_label =3D manageGlobalLabel
+view_label_details =3D viewLabelDetails
+view_label_project =3D viewLabelProject
+create_project_label =3D createProjectLabel
+remove_project_label =3D removeProjectLabel
+create_project_label_with_sp =3D createProjectLabelWithSubprojects
+remove_project_label_with_sp =3D removeProjectLabelWithSubprojects
+generate_projects =3D generateProjectFromTemplate
+
+manage_assignments =3D manageUsersProjectsAssignements
+view_timesheetAdvanced =3D viewTimesheetAdvanced
+save_timesheetAdvanced =3D saveTimesheetAdvanced
+update_timesheetAdvanced =3D updateTimesheetAdvanced
+delete_timesheetAdvanced =3D deleteTimesheetAdvanced
#To be used by the admim role in order to add/remove a user when not in Ja=
hia
=
=
@@ -140,3 +159,4 @@
=
delete_user=3DdeleteUser
=
+
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
