You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/04/06 09:53:26 UTC
svn commit: r762245 - in /ofbiz/trunk: applications/order/script/org/ofbiz/order/request/ framework/common/config/ framework/security/config/ specialpurpose/ specialpurpose/mypage/ specialpurpose/myportal/config/ specialpurpose/myportal/widget/ special...

Author: hansbak
Date: Mon Apr  6 07:53:25 2009
New Revision: 762245

URL: http://svn.apache.org/viewvc?rev=762245&view=rev
Log:
delete mypage component,moved some labels,  myportal is a good replacement

Removed:
    ofbiz/trunk/specialpurpose/mypage/
Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
    ofbiz/trunk/specialpurpose/component-load.xml
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Mon Apr  6 07:53:25 2009
@@ -150,15 +150,6 @@
                             <set field="custRequest.statusId" from-field="parameters.statusId"/>
                             <set field="updTask.workEffortId" from-field="workEffort.workEffortId"/>
                             <set field="updTask.currentStatusId" value="PTS_CANCELLED"/>
-                            <if-has-permission permission="MYPAGE_CUSTOMER">
-                                <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
-                                    <field-map field-name="userLoginId" value="system"/>
-                                </entity-one>
-                                <set field="updTask.userLogin" from-field="userLogin"/>
-                                <else>
-                                    <set field="updTask.userLogin" from-field="userLogin"/>
-                                </else>
-                            </if-has-permission>
                             <call-service service-name="updateWorkEffort" in-map-name="updTask"/>
                             <else>
                                 <set field="parameters.statusId" from-field="custRequest.statusId"/>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Apr  6 07:53:25 2009
@@ -8238,13 +8238,6 @@
         <value xml:lang="zh">å¸åºå®£ä¼ </value>
         <value xml:lang="zh_CN">æ¨é</value>
     </property>
-    <property key="MyPage">
-        <value xml:lang="de">Meine Seite</value>
-        <value xml:lang="en">MyPage</value>
-        <value xml:lang="es">Mi PÃ¡gina</value>
-        <value xml:lang="fr">Ma page</value>
-        <value xml:lang="it">Mia pagina</value>
-    </property>
     <property key="MyPortal">
         <value xml:lang="en">My Portal</value>
         <value xml:lang="fr">Mon portail</value>

Modified: ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml (original)
+++ ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml Mon Apr  6 07:53:25 2009
@@ -76,18 +76,6 @@
         <value xml:lang="ru">ÐÑÑÐ¿Ð¿Ð° 'ÐÐ¾Ð»Ð½ÑÐ¹ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ', ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð²ÑÐµ Ð¾Ð±ÑÐ¸Ðµ Ð¿ÑÐ°Ð²Ð°.</value>
         <value xml:lang="th">Full Admin group, has all general permissions.</value>
     </property>
-    <property key="SecurityGroup.description.MYPAGE_CUSTOMER">
-        <value xml:lang="en">Customer user of mypage, Limited access to own custRequests, and project</value>
-        <value xml:lang="it">Utente di mypage, accesso limitato al proprietario delle richieste cliente, e progetti</value>
-    </property>
-    <property key="SecurityGroup.description.MYPAGE_EMPL-NOEMAIL">
-        <value xml:lang="en">Employee user of mypage, Limited access to the projectmgr and comms, custReq, no email</value>
-        <value xml:lang="it">Utente impiegato di mypage, accesso limitato ai progetti e comunicazioni, richieste cliente, no email</value>
-    </property>
-    <property key="SecurityGroup.description.MYPAGE_EMPLOYEE">
-        <value xml:lang="en">Employee user of mypage, Limited access to the projectmgr, comms,custRequests</value>
-        <value xml:lang="it">Utente impiegato di mypage, accesso limitato ai progetti e comunicazioni, richieste cliente</value>
-    </property>
     <property key="SecurityGroup.description.MYPORTAL_CUSTOMER">
         <value xml:lang="en">Customer user of MYPORTAL, Limited access to own custRequests, and project</value>
         <value xml:lang="it">Utente di myportal, accesso limitato al proprietario delle richieste cliente, e progetti</value>
@@ -828,18 +816,6 @@
         <value xml:lang="ru">ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¸ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° Ð² Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸ Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¼Ð°ÑÐºÐµÑÐ¸Ð½Ð³Ð¾Ð¼.</value>
         <value xml:lang="th">à¸à¸²à¸£à¹à¸ªà¸à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¹à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸¥à¸²à¸</value>
     </property>
-    <property key="SecurityPermission.description.MYPAGE_CUSTOMER">
-        <value xml:lang="en">Use the customer screens in mypage.</value>
-        <value xml:lang="it">Usare la visualizzazione clienti in mypage.</value>
-    </property>
-    <property key="SecurityPermission.description.MYPAGE_EMPL-NOEMAIL">
-        <value xml:lang="en">Usage of the employee screens in mypage: projectmanager and internal notes.</value>
-        <value xml:lang="it">Usare la visualizzazione clienti in mypage: gestione progetti e note interne.</value>
-    </property>
-    <property key="SecurityPermission.description.MYPAGE_EMPLOYEE">
-        <value xml:lang="en">Use the employee screens in mypage.</value>
-        <value xml:lang="it">Usare la visualizzazione impiegati in mypage.</value>
-    </property>
     <property key="SecurityPermission.description.MYPORTAL_CUSTOMER">
         <value xml:lang="en">Use the customer screens in myportal.</value>
         <value xml:lang="it">Usare la visualizzazione clienti in myportal.</value>

Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Mon Apr  6 07:53:25 2009
@@ -29,7 +29,6 @@
     <load-component component-location="oagis"/>
     <load-component component-location="googlebase"/>
     <load-component component-location="ebay"/>
-    <load-component component-location="mypage"/>
     <load-component component-location="myportal"/>
     <load-component component-location="webpos"/>
     <!-- <load-component component-location="workflow"/> -->

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Mon Apr  6 07:53:25 2009
@@ -65,6 +65,14 @@
         <value xml:lang="it">Mie richieste cliente completate</value>
         <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¹à¸à¹à¹à¸à¹à¸«à¹à¸¥à¸¹à¸à¸à¹à¸²à¹à¸£à¸µà¸¢à¸¢à¸£à¹à¸à¸¢à¹à¸¥à¹à¸§</value>
     </property>
+    <property key="MyPortalCustRequestNotificationMailCompleted">
+        <value xml:lang="en">Customer Request Completed Notification Mai</value>
+        <value xml:lang="it">Notifica mail per richiesta cliente completata</value>
+    </property>
+    <property key="MyPortalCustRequestNotificationMailCreation">
+        <value xml:lang="en">Customer Request Creation Notification Mail</value>
+        <value xml:lang="it">Notifica mail per richiesta cliente creata</value>
+    </property>
     <property key="MyPortalCustRequests">
         <value xml:lang="en">My customer requests</value>
         <value xml:lang="fr">Mes demandes utilisateur</value>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Mon Apr  6 07:53:25 2009
@@ -59,7 +59,7 @@
     <screen name="CreateCustRequestNotification">
         <section>
             <actions>
-                <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation} #${custRequestId}"/>
+                <set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCreation} #${custRequestId}"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://myportal/templates/email/CreateCustRequestNotification.ftl"/></html></platform-specific>
@@ -69,7 +69,7 @@
     <screen name="CompletedCustRequestNotification">
         <section>
             <actions>
-                <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCompleted} #${custRequestId}"/>
+                <set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCompleted} #${custRequestId}"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://myportal/templates/email/CompletedCustRequestNotification.ftl"/></html></platform-specific>
@@ -79,7 +79,7 @@
     <screen name="CreateUserNotification">
         <section>
             <actions>
-                <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation}"/>
+                <set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCreation}"/>
                 </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Mon Apr  6 07:53:25 2009
@@ -830,6 +830,10 @@
         <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸±à¹à¸à¸à¸à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸µà¹à¸ªà¸£à¹à¸²à¸à¹à¸ªà¸£à¹à¸à¹à¸¥à¹à¸§ , à¸à¸²à¸à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸¡à¸µà¸à¸¢à¸¹à¹à¹à¸à¸¢à¸à¸£à¸²à¸¨à¸à¸²à¸à¸à¸±à¹à¸à¸à¸à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¹à¸«à¸¡à¸·à¸à¸à¸à¸¥à¸¸à¹à¸¡ , à¸à¸±à¸à¸à¸±à¹à¸à¸ªà¸£à¹à¸²à¸à¸à¸±à¹à¸à¸à¸à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¹à¸à¹à¸à¸à¸±à¸à¸à¸±à¸à¹à¸£à¸</value>
         <value xml:lang="zh">è¯¥é¡¹ç®ææ²¡æåå»ºä»»ä½çé¶æ®µï¼è¯·ååå»ºé¡¹ç®é¶æ®µï¼ä»»å¡å¿é¡»ä»¥é¡¹ç®é¶æ®µä¸ºç¶èç¹</value>
     </property>
+    <property key="ProjectMgrNoProjectsFound">
+        <value xml:lang="en">no projects found</value>
+        <value xml:lang="it">Tu non hai l'accesso a queste informazioni</value>
+    </property>
     <property key="ProjectMgrNonBilledActualHours">
         <value xml:lang="en">Act Hrs not billed</value>
         <value xml:lang="fr">Heures rÃ©elles non facturÃ©es</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=762245&r1=762244&r2=762245&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Apr  6 07:53:25 2009
@@ -1146,7 +1146,7 @@
                         <if-empty field="projects"/>
                     </condition>
                     <widgets>
-                        <label style="h2" text="${uiLabelMap.MyPageNoProjectsFound}"></label>
+                        <label style="h2" text="${uiLabelMap.ProjectMgrNoProjectsFound}"></label>
                     </widgets>
                 </section>
             </widgets>