Author: hansbak
Date: Mon Oct 20 23:42:47 2008 New Revision: 706539 URL: http://svn.apache.org/viewvc?rev=706539&view=rev Log: remove the links on the projectforms shown to the customer Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=706539&r1=706538&r2=706539&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Mon Oct 20 23:42:47 2008 @@ -283,4 +283,11 @@ <hyperlink also-hidden="true" target-type="plain" description="Send" target="javascript:(document.MyPageNewEmail.submit())"/> </field> </form> + <form name="ListPhaseInfo" extends="ListPhaseInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml"> + <field name="phase"><display description="${phaseName}"/></field> + </form> + <form name="ListTaskInfo" extends="ListTaskInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml"> + <field name="task"><display description="${workEffortName}"/></field> + </form> + </forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=706539&r1=706538&r2=706539&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Mon Oct 20 23:42:47 2008 @@ -680,13 +680,38 @@ <screenlet title="${uiLabelMap.PageTitleProjectInformation}"> <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </screenlet> - <include-screen name="PhasesInfo" location="component://projectmgr/widget/ProjectScreens.xml"/> + <section> + <actions> + <service service-name="getProjectPhaseList" result-map-name="result"> + <field-map field-name="projectId" env-name="projectId"/> + </service> + <set field="phases" from-field="result.phaseList"/> + </actions> + <widgets> + <container style="screenlet"> + <screenlet title="${uiLabelMap.ProjectMgrPhases}"> + <include-form name="ListPhaseInfo" location="component://mypage/widget/MyPageForms.xml"/> + </screenlet> + </container> + </widgets> + </section> </container> <container style="righthalf"> - <include-screen name="TasksInfo" location="component://projectmgr/widget/ProjectScreens.xml"/> + <section> + <actions> + <service service-name="getProjectTaskList" result-map-name="result"> + <field-map field-name="projectId" env-name="projectId"/> + </service> + <set field="tasks" from-field="result.taskList"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.ProjectMgrTasks}" navigation-form-name="ListTaskInfo"> + <include-form name="ListTaskInfo" location="component://mypage/widget/MyPageForms.xml"/> + </screenlet> + </widgets> + </section> </container> <container style="clear"/> - <label text="====${parameters.projectId}"></label> <screenlet title="${uiLabelMap.PageTitleProjectGanttChart}"> <platform-specific> <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=706539&r1=706538&r2=706539&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Mon Oct 20 23:42:47 2008 @@ -91,7 +91,11 @@ }else{ taskInfo.completion = 0; } - taskInfo.url = "/projectmgr/control/taskView?workEffortId="+task.workEffortId; + if (security.hasEntityPermission("PROJECTMGR", "_READ", session) || security.hasEntityPermission("PROJECTMGR", "_ADMIN", session)) { + taskInfo.url = "/projectmgr/control/taskView?workEffortId="+task.workEffortId; + } else { + taskInfo.url = ""; + } resultTaskResource = dispatcher.runSync("getTasksByParties", [userLogin : userLogin , workEffortId : task.workEffortId]); taskParties = resultTaskResource.taskParties; resource = ""; Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=706539&r1=706538&r2=706539&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Oct 20 23:42:47 2008 @@ -553,18 +553,9 @@ </actions> <widgets> <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProjectMgrPhases}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </widgets> - </section> - </container> + <screenlet title="${uiLabelMap.ProjectMgrPhases}"> + <include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </screenlet> </container> </widgets> </section> |
Free forum by Nabble | Edit this page |