Author: truong.le Date: 2009-11-09 03:50:57 -0500 (Mon, 09 Nov 2009) New Revision: 523 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java Log: GTNPORTAL-163: Show message wrong when user doesn't not have right to edit portal Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-09 08:50:57 UTC (rev 523) @@ -1266,7 +1266,8 @@ </UIAdvancedCustomization> <UIPortalManagement> <msg> - <Invalid-editPermission>!ليس لديك الحق في تحرير البوابة</Invalid-editPermission> + <Invalid-EditPage-Permission>\u0644\u0627 \u064A\u0648\u062C\u062F \u0644\u062F\u064A\u0643 \u0627\u0644\u062D\u0642 \u0641\u064A \u062A\u0639\u062F\u064A\u0644 \u0647\u0630\u0647 \u0627\u0644\u0635\u0641\u062D\u0629</Invalid-EditPage-Permission> + <Invalid-EditLayout-Permission>\u0644\u0627 \u064A\u0648\u062C\u062F \u0644\u062F\u064A\u0643 \u0627\u0644\u062D\u0642 \u0641\u064A \u062A\u062D\u0631\u064A\u0631 \u0647\u0630\u0627 \u0627\u0644\u062A\u0635\u0645\u064A\u0645</Invalid-EditLayout-Permission> </msg> <title> <EDIT>تعديل البوابة الحالية</EDIT> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -726,7 +726,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Page UIAdvancedCustomization.label.UIPortalManagement=Portal Management UIAdvancedCustomization.label.UIPageManagement=Page Management -UIPortalManagement.msg.Invalid-editPermission=You don't have the permission to edit this portal. +UIPortalManagement.msg.Invalid-EditLayout-Permission=You have no right to edit this layout. +UIPortalManagement.msg.Invalid-EditPage-Permission=You have no right to edit this page. UIPortalManagement.title.EDIT=Edit current Portal UIPortalManagement.title.BROWSE=Manage Portals Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -702,7 +702,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Page UIAdvancedCustomization.label.UIPortalManagement=Gestion de portail UIAdvancedCustomization.label.UIPageManagement=Gestion de page -UIPortalManagement.msg.Invalid-editPermission=Vous n'avez pas les droits suffisants pour éditer le portail ! +UIPortalManagement.msg.Invalid-EditLayout-Permission=Vous n'avez pas le droit de modifier cette disposition. +UIPortalManagement.msg.Invalid-EditPage-Permission=Vous n'avez pas le droit de modifier cette page. UIPortalManagement.title.EDIT=Editer le portail en cours UIPortalManagement.title.BROWSE=Parcourir les portails existants Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -716,7 +716,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Страница UIAdvancedCustomization.label.UIPortalManagement=Управление порталом UIAdvancedCustomization.label.UIPageManagement=Управление страницами -UIPortalManagement.msg.Invalid-editPermission=У Вас нету прав для редактирования этого портала. +UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u043D\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043C\u0430\u043A\u0435\u0442\u0430. +UIPortalManagement.msg.Invalid-EditPage-Permission=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443. UIPortalManagement.title.EDIT=Изменить портал UIPortalManagement.title.BROWSE=Управление порталами Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -707,7 +707,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Сторінка UIAdvancedCustomization.label.UIPortalManagement=Управління порталом UIAdvancedCustomization.label.UIPageManagement=Управління сторінкою -UIPortalManagement.msg.Invalid-editPermission=У Вас немає прав, щоб редагувати цей портал. +UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0412\u0438 \u043D\u0435 \u043C\u0430\u0454\u0442\u0435 \u043D\u0456\u044F\u043A\u043E\u0433\u043E \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0446\u0435 \u0440\u043E\u0437\u0442\u0430\u0448\u0443\u0432\u0430\u043D\u043D\u044F. +UIPortalManagement.msg.Invalid-EditPage-Permission=\u0412\u0438 \u043D\u0435 \u043C\u0430\u0454\u0442\u0435 \u0436\u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0446\u044E \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0443. UIPortalManagement.title.EDIT=Редагувати поточний портал UIPortalManagement.title.BROWSE=Управління порталами Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-09 08:50:57 UTC (rev 523) @@ -707,7 +707,8 @@ UIAdvancedCustomization.icon.UIPageManagement=Trang UIAdvancedCustomization.label.UIPortalManagement=Quản lý Portal UIAdvancedCustomization.label.UIPageManagement=Quản lý trang -UIPortalManagement.msg.Invalid-editPermission=Bạn không được phân quyền để chỉnh sửa Portal này! +UIPortalManagement.msg.Invalid-EditLayout-Permission=B\u1EA1n kh\u00F4ng c\u00F3 quy\u1EC1n ch\u1EC9nh s\u1EEDa layout. +UIPortalManagement.msg.Invalid-EditPage-Permission=B\u1EA1n kh\u00F4ng c\u00F3 quy\u1EC1n ch\u1EC9nh s\u1EEDa trang n\u00E0y. UIPortalManagement.title.EDIT=Chỉnh sửa Portal hiện tại UIPortalManagement.title.BROWSE=Khảo sát các Portal Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-09 08:50:57 UTC (rev 523) @@ -415,6 +415,7 @@ portalComposer.setShowControl(true); portalComposer.setEditted(false); portalComposer.setCollapse(false); + portalComposer.setId("UIPageEditor"); portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor"); UIPortalToolPanel uiToolPanel = Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2009-11-09 07:57:01 UTC (rev 522) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2009-11-09 08:50:57 UTC (rev 523) @@ -66,7 +66,7 @@ UserACL userACL = uiApp.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(page)) { - uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-editPermission", null)); + uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-EditPage-Permission", null)); return; } @@ -127,7 +127,7 @@ UserACL userACL = uiPortal.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(portalConfig)) { - uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-editPermission", + uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-EditLayout-Permission", new String[]{uiPortal.getName()})); return; }