svn commit: r686596 - in /ofbiz/trunk/specialpurpose/my
Locked
 
|
Author: hansbak
Date: Sun Aug 17 02:23:24 2008 New Revision: 686596 URL: http://svn.apache.org/viewvc?rev=686596&view=rev Log: enable the internal comm notes to a customer and add demo data for different employee groups. Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml ofbiz/trunk/specialpurpose/mypage/data/MyPageSecurityData.xml ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=686596&r1=686595&r2=686596&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Sun Aug 17 02:23:24 2008 @@ -67,8 +67,8 @@ <value xml:lang="fr">Au moins une permission MYPAGE_CUSTOMER ou MYPAGE_EMPLOYEE est nécessaire</value> </property> <property key="MyPageNoAccess4"> - <value xml:lang="en">Use the demo userLogin id's 'DemoCustomer1' and 'DemoEmployee1' for a demo.</value> - <value xml:lang="fr">Utilisez l'identifiant de connexion 'DemoCustomer1' ou 'DemoEmployee1' pour une démonstration.</value> + <value xml:lang="en">Use the demo userLogin id's 'DemoCustomer' and 'DemoEmployee' for a demo.</value> + <value xml:lang="fr">Utilisez l'identifiant de connexion 'DemoCustomer' ou 'DemoEmployee' pour une démonstration.</value> </property> <property key="MyPagePagesVisible"> <value xml:lang="en">pages visible on the main screen.</value> Modified: ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml?rev=686596&r1=686595&r2=686596&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml Sun Aug 17 02:23:24 2008 @@ -43,18 +43,15 @@ <UserLoginSecurityGroup groupId="MYPAGE_CUSTOMER" userLoginId="DemoCustomer1" fromDate="2000-01-01 00:00:00.0"/> <UserLoginSecurityGroup groupId="MYPAGE_CUSTOMER" userLoginId="DemoCustomer2" fromDate="2000-01-01 00:00:00.0"/> <UserLoginSecurityGroup groupId="MYPAGE_CUSTOMER" userLoginId="DemoCustomer3" fromDate="2000-01-01 00:00:00.0"/> - <!-- demo employee has limited projectmanager access including timesheets, can read/write internal notes--> - <UserLoginSecurityGroup groupId="MYPAGE_EMPLOYEE" userLoginId="DemoEmployee1" fromDate="2000-01-01 00:00:00.0"/> - <UserLoginSecurityGroup groupId="MYPAGE_EMPLOYEE" userLoginId="DemoEmployee2" fromDate="2000-01-01 00:00:00.0"/> - <UserLoginSecurityGroup groupId="MYPAGE_EMPLOYEE" userLoginId="DemoEmployee3" fromDate="2000-01-01 00:00:00.0"/> + <!-- demo employee has limited projectmanager access including timesheets, can read/write comms internal notes but cannot send external email--> + <UserLoginSecurityGroup groupId="MYPAGE_EMPL-NOEMAIL" userLoginId="DemoEmployee1" fromDate="2000-01-01 00:00:00.0"/> + <UserLoginSecurityGroup groupId="MYPAGE_EMPL-NOEMAIL" userLoginId="DemoEmployee2" fromDate="2000-01-01 00:00:00.0"/> + <UserLoginSecurityGroup groupId="MYPAGE_EMPL-NOEMAIL" userLoginId="DemoEmployee3" fromDate="2000-01-01 00:00:00.0"/> <!-- employee have no access to any project --> <UserLoginSecurityGroup groupId="MYPAGE_EMPLOYEE" userLoginId="DemoEmployee" fromDate="2000-01-01 00:00:00.0"/> - <!-- admin logins --> <UserLoginSecurityGroup groupId="MYPAGE_EMPLOYEE" userLoginId="admin" fromDate="2000-01-01 00:00:00.0"/> - <UserLoginSecurityGroup groupId="MYPAGE_CUSTOMER" userLoginId="admin" fromDate="2000-01-01 00:00:00.0"/> <UserLoginSecurityGroup groupId="MYPAGE_EMPLOYEE" userLoginId="demoadmin" fromDate="2000-01-01 00:00:00.0"/> - <UserLoginSecurityGroup groupId="MYPAGE_CUSTOMER" userLoginId="demoadmin" fromDate="2000-01-01 00:00:00.0"/> Modified: ofbiz/trunk/specialpurpose/mypage/data/MyPageSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/data/MyPageSecurityData.xml?rev=686596&r1=686595&r2=686596&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/data/MyPageSecurityData.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/data/MyPageSecurityData.xml Sun Aug 17 02:23:24 2008 @@ -20,20 +20,35 @@ <entity-engine-xml> <SecurityPermission permissionId="MYPAGE_EMPLOYEE" description="Use the employee screens in mypage."/> - <SecurityGroup description="Employee user of mypage, giving limited access to the projectmanager and communications" groupId="MYPAGE_EMPLOYEE"/> + <SecurityGroup description="Employee user of mypage, giving limited access to the projectmanager and communications can create email and create customer requests" groupId="MYPAGE_EMPLOYEE"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="MYPAGE_EMPLOYEE"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PROJECTMGR_VIEW"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PROJECTMGR_ROLE_VIEW"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PROJECTMGR_ROLE_TASK_CREATE"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PROJECTMGR_ROLE_TIMESHEET_CREATE"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PROJECTMGR_ROLE_TIMESHEET_UPDATE"/> - <!-- be able to send and receive internal notes --> - <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PARTYMGR_CME_CREATE"/> <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PARTYMGR_CME_UPDATE"/> + <!-- be able to create internal notes and email--> + <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PARTYMGR_CME-EMAIL_CREATE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PARTYMGR_CME-NOTE_CREATE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="PARTYMGR_CME-NOTE_CREATE"/> + <!-- and can create customer request from emails --> + <SecurityGroupPermission groupId="MYPAGE_EMPLOYEE" permissionId="ORDERMGR_CRQ_CREATE"/> + + <SecurityPermission permissionId="MYPAGE_EMPL-NOEMAIL" description="Use the employee screens in mypage have limited access to the projectmanager and can create internal notes."/> + <SecurityGroup description="Employee user of mypage, giving limited access to the projectmanager and communications" groupId="MYPAGE_EMPL-NOEMAIL"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="MYPAGE_EMPLOYEE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PROJECTMGR_VIEW"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PROJECTMGR_ROLE_VIEW"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PROJECTMGR_ROLE_TASK_CREATE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PROJECTMGR_ROLE_TIMESHEET_CREATE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PROJECTMGR_ROLE_TIMESHEET_UPDATE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PARTYMGR_CME-NOT_CREATE"/> + <SecurityGroupPermission groupId="MYPAGE_EMPL-NOEMAIL" permissionId="PARTYMGR_CME_UPDATE"/> <SecurityPermission permissionId="MYPAGE_CUSTOMER" description="Use the customer screens in mypage."/> <SecurityGroup description="Customer user of mypage, giving limited access to entered customer requests and related tasks" groupId="MYPAGE_CUSTOMER"/> + <SecurityGroupPermission groupId="MYPAGE_CUSTOMER" permissionId="PARTYMGR_CME-NOTE_CREATE"/><!-- allow customer to read/write internal notes --> <SecurityGroupPermission groupId="MYPAGE_CUSTOMER" permissionId="MYPAGE_CUSTOMER"/> - - + <SecurityGroupPermission groupId="MYPAGE_CUSTOMER" permissionId="PARTYMGR_CME_UPDATE"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=686596&r1=686595&r2=686596&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Aug 17 02:23:24 2008 @@ -288,6 +288,8 @@ <screenlet title="${uiLabelMap.MyCustRequests}" navigation-form-name="ListRequestList" > <include-form name="ListCustRequests" location="component://mypage/widget/MyPageForms.xml"/> </screenlet> + <include-screen name="MyCommunications" + location="component://mypage/widget/MyPageScreens.xml"/> </widgets> </section> </screen> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=686596&r1=686595&r2=686596&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Aug 17 02:23:24 2008 @@ -104,20 +104,17 @@ </menu-item> </menu> <menu name="communicationsMenu"> - <actions> - <entity-and entity-name="PartyContactDetailByPurpose" filter-by-date="true" list-name="emails"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> - </entity-and> - </actions> <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}"> <condition> - <not><if-empty field-name="emails"/></not> + <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/> </condition> <link target="EditCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&donePage=${parameters.donePage}" /> </menu-item> <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}"> + <condition> + <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> + </condition> <link target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&donePage=${parameters.donePage}" /> </menu-item> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |