svn commit: r730990 - in /ofbiz/trunk/framework/webtool
Locked
svn commit: r730990 - in /ofbiz/trunk/framework/webtool
 
|
Author: jleroux
Date: Sat Jan 3 06:33:01 2009 New Revision: 730990 URL: http://svn.apache.org/viewvc?rev=730990&view=rev Log: A slightly modified patch from Bruno Busco "Updating Webtool JobList to use PerformFind and FindScreenDecorator" '(https://issues.apache.org/jira/browse/OFBIZ-2103) - OFBIZ-2103 with some i18n and French l10n Removed: ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/trunk/framework/webtools/servicedef/services.xml ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml ofbiz/trunk/framework/webtools/widget/CommonScreens.xml ofbiz/trunk/framework/webtools/widget/EntityScreens.xml ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml ofbiz/trunk/framework/webtools/widget/LogScreens.xml ofbiz/trunk/framework/webtools/widget/Menus.xml ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original) +++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sat Jan 3 06:33:01 2009 @@ -1122,12 +1122,6 @@ <value xml:lang="it">Risultati della Ricerca</value> <value xml:lang="th">à¸à¸¥à¸¥à¸±à¸à¸à¹à¸à¸à¸à¸à¸²à¸£à¸à¹à¸à¸«à¸²</value> </property> - <property key="WebtoolsFinishedStatus"> - <value xml:lang="en">Finished status</value> - <value xml:lang="fr">Statut de fin</value> - <value xml:lang="it">stato completato</value> - <value xml:lang="th">สà¸à¸²à¸à¸°à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸</value> - </property> <property key="WebtoolsFkIdx"> <value xml:lang="en">Fk-Idx</value> <value xml:lang="fr">Indice-Clè étrangère</value> @@ -1380,12 +1374,6 @@ <value xml:lang="th">à¸à¸²à¸</value> <value xml:lang="zh">ä»»å¡</value> </property> - <property key="WebtoolsJobFilterOn"> - <value xml:lang="en">Filter jobs on</value> - <value xml:lang="fr">Filtrer les jobs actifs</value> - <value xml:lang="it">Filtra i lavori in</value> - <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£</value> - </property> <property key="WebtoolsJobList"> <value xml:lang="en">Job List</value> <value xml:lang="fr">Liste des jobs</value> @@ -1596,13 +1584,14 @@ <value xml:lang="th">à¹à¸à¸à¸à¸¥à¸´à¹à¸à¸à¸±à¹à¸à¸à¸µà¹à¹à¸à¹à¸à¸ªà¸´à¹à¸à¹à¸£à¸à¹à¸£à¸´à¹à¸¡à¸à¸¶à¸à¸à¸¢à¸²à¸à¹à¸«à¹à¹à¸à¹à¸²à¸£à¹à¸§à¸¡à¸à¸±à¸à¸à¸²à¸£à¸°à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸±à¸à¸à¸±à¸à¸à¸²à¸£à¸°à¸à¸à¹à¸¥à¸°à¸£à¸°à¸à¸à¸à¸à¸à¸à¸¹à¹à¸à¸¹à¹à¸¥à¸£à¸°à¸à¸</value> <value xml:lang="zh">æ¬åºç¨ç¨åºä¸»è¦ä¾å¼å人ååç³»ç»ç®¡çå使ç¨</value> </property> - <property key="WebtoolsMessage14"> - <value xml:lang="en">For something interesting make sure you are logged in, try username: admin, password: ofbiz</value> - <value xml:lang="fr">Pour quelque chose d'intéressant assurez-vous que vous avez ouvert une session. Essayez avec l'identifiant de connexion : admin, le mot de passe : ofbiz</value> - <value xml:lang="it">Se interessato, devi essere autenticato, provare con Nome utente:admin, Password:ofbiz</value> - <value xml:lang="ro">Daca esti interesat, trebuie sa ai autentificare, incearca cu cu Nume utilizator :admin, Pasword :ofbiz</value> - <value xml:lang="th">à¹à¸à¸·à¹à¸à¸à¸§à¸²à¸¡à¹à¸à¹à¹à¸à¸à¸¸à¸à¸à¸§à¸£à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸à¹à¸à¸¢à¹à¸à¹ à¸à¸·à¹à¸à¸à¸¹à¹à¸à¹: admin, รหัสà¸à¹à¸²à¸: ofbiz</value> - <value xml:lang="zh">å¦æä½ å¯¹å ¶ä¸çæäºåè½æå ´è¶£ï¼è¯·å ç»å½ï¼å¯ä»¥å°è¯ä½¿ç¨ç¨æ·åï¼adminãå¯ç ï¼ofbizç»å½</value> + <property key="WebtoolsViewPermissionError"> + <value xml:lang="en">You do not have permission to view this page. ("OFBTOOLS_VIEW" or "OFBTOOLS_ADMIN" needed)</value> + <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page ("OFBTOOLS_VIEW" ou "OFBTOOLS_ADMIN" nécessaire)</value> + <value xml:lang="it">Non sei autorizzato a vedere questa pagina. (Necessario permesso "OFBTOOLS_VIEW" o "OFBTOOLS_ADMIN")</value> + <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. (Este necesar Permisul "OFBTOOLS_VIEW" sau "OFBTOOLS_ADMIN")</value> + <value xml:lang="ru">У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав Ð´Ð»Ñ Ð¿ÑоÑмоÑÑа ÑÑой ÑÑÑаниÑÑ. (Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ñ Ð¿Ñава "OFBTOOLS_VIEW" или "OFBTOOLS_ADMIN")</value> + <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸£à¸±à¸à¸à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¹à¸à¹à¸²à¸à¸¹à¸«à¸à¹à¸²à¸à¸µà¹à¹à¸à¹ (หà¸à¹à¸² "OFBTOOLS_VIEW" หรืภ"OFBTOOLS_ADMIN" à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£)</value> + <value xml:lang="zh">ä½ æ²¡ææµè§è¿ä¸ªé¡µé¢çæéã(éè¦"OFBTOOLS_VIEW"æ"OFBTOOLS_ADMIN")</value> </property> <property key="WebtoolsMessage15"> <value xml:lang="en">You may create an Entity</value> @@ -2056,12 +2045,6 @@ <value xml:lang="th">หยุภ(secs) ระหวà¹à¸²à¸à¹à¸à¸¥à¹</value> <value xml:lang="zh">æ件é´æå (ç§)</value> </property> - <property key="WebtoolsPendingStatus"> - <value xml:lang="en">Pending status</value> - <value xml:lang="fr">Statut "en attente"</value> - <value xml:lang="it">stato di atteso</value> - <value xml:lang="th">สà¸à¸²à¸à¸°à¸à¸¢à¸¹à¹à¹à¸à¸£à¸°à¸«à¸§à¹à¸²à¸</value> - </property> <property key="WebtoolsPerformanceCalls"> <value xml:lang="en">Calls</value> <value xml:lang="fr">Appels</value> @@ -2404,12 +2387,6 @@ <value xml:lang="th">à¹à¸§à¸¥à¸²à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸</value> <value xml:lang="zh">è¿è¡æ¶é´</value> </property> - <property key="WebtoolsRunningStatus"> - <value xml:lang="en">Running status</value> - <value xml:lang="fr">Statut "En cours"</value> - <value xml:lang="it">stato di esecuzione</value> - <value xml:lang="th">สà¸à¸²à¸à¸°à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> - </property> <property key="WebtoolsSchedule"> <value xml:lang="en">Schedule</value> <value xml:lang="fr">Planifier</value> Modified: ofbiz/trunk/framework/webtools/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/servicedef/services.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/servicedef/services.xml (original) +++ ofbiz/trunk/framework/webtools/servicedef/services.xml Sat Jan 3 06:33:01 2009 @@ -115,29 +115,7 @@ if the user has the ENTITY_MAINT permission.</description> <implements service="permissionInterface"/> </service> - - - <service name="jobList" engine="java" - location="org.ofbiz.webtools.WebToolsServices" invoke="findJobs" auth="true" use-transaction="false"> - <description>Find Jobs</description> - <attribute name="serviceName" type="String" mode="IN" optional="true"/> - <attribute name="jobId" type="String" mode="IN" optional="true"/> - <attribute name="jobName" type="String" mode="IN" optional="true"/> - <attribute name="VIEW_INDEX" type="String" mode="IN" optional="true"/> - <attribute name="VIEW_SIZE" type="String" mode="IN" optional="true"/> - <attribute name="showAll" type="String" mode="IN" optional="true"/> - <attribute name="lookupFlag" type="String" mode="IN" optional="true"/> - <attribute name="viewSize" type="Integer" mode="OUT" optional="false"/> - <attribute name="viewIndex" type="Integer" mode="OUT" optional="false"/> - <attribute name="lowIndex" type="Integer" mode="OUT" optional="false"/> - <attribute name="highIndex" type="Integer" mode="OUT" optional="false"/> - <attribute name="paramList" type="String" mode="OUT" optional="false"/> - <attribute name="jobs" type="List" mode="OUT" optional="false"/> - <attribute name="jobListSize" type="Integer" mode="OUT" optional="false"/> - <attribute name="filterJobsWithPendingStatus" type="String" mode="INOUT" optional="true"/> - <attribute name="filterJobsWithRunningStatus" type="String" mode="INOUT" optional="true"/> - <attribute name="filterJobsWithFinishedStatus" type="String" mode="INOUT" optional="true"/> - </service> + <service name="exportServiceEoModelBundle" engine="java" location="org.ofbiz.webtools.WebToolsServices" invoke="exportServiceEoModelBundle" auth="true" use-transaction="false"> <description>Saves service and related artifacts diagram to an Apple EOModelBundle file. </description> Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Sat Jan 3 06:33:01 2009 @@ -885,134 +885,6 @@ return resultMap; } - public static Map<String, Object> findJobs(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> result = ServiceUtil.returnSuccess(); - GenericDelegator delegator = dctx.getDelegator(); - String serviceName = (String) context.get("serviceName"); - String jobId = (String) context.get("jobId"); - String jobName = (String) context.get("jobName"); - - // set the page parameters - int viewIndex = 0; - try { - viewIndex = Integer.parseInt((String) context.get("VIEW_INDEX")); - } catch (Exception e) { - viewIndex = 0; - } - result.put("viewIndex", viewIndex); - - int viewSize = 50; - try { - viewSize = Integer.parseInt((String) context.get("VIEW_SIZE")); - } catch (Exception e) { - viewSize = 50; - } - result.put("viewSize", viewSize); - -// get the lookup flag - String lookupFlag = (String) context.get("lookupFlag"); - - // list to hold the parameters - List<String> paramList = FastList.newInstance(); - List<EntityCondition> conditions = FastList.newInstance(); - List<GenericValue> jobList = null; - int jobListSize = 0; - int lowIndex = 0; - int highIndex = 0; - EntityListIterator eli = null; - - if ("Y".equals(lookupFlag)) { - String showAll = (context.get("showAll") != null ? (String) context.get("showAll") : "N"); - paramList.add("showAll=" + showAll); - paramList.add("lookupFlag=" + lookupFlag); - if (UtilValidate.isNotEmpty(serviceName)) { - paramList.add("serviceName=" + serviceName); - conditions.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("serviceName"), EntityOperator.LIKE, EntityFunction.UPPER("%"+serviceName+"%"))); - } - if (UtilValidate.isNotEmpty(jobId)) { - paramList.add("jobId=" + jobId); - conditions.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("jobId"), EntityOperator.LIKE, EntityFunction.UPPER("%"+jobId+"%"))); - } - if (UtilValidate.isNotEmpty(jobName)) { - paramList.add("jobName=" + jobName); - conditions.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("jobName"), EntityOperator.LIKE, EntityFunction.UPPER("%"+jobName+"%"))); - } - List<EntityCondition> filterExprs = FastList.newInstance(); - String filterJobPending = (String) context.get("filterJobsWithPendingStatus"); - String filterJobRunning = (String) context.get("filterJobsWithRunningStatus"); - String filterJobFinished = (String) context.get("filterJobsWithFinishedStatus"); - - if (filterJobPending == null) { - filterJobPending = "N"; - } - if (filterJobRunning == null) { - filterJobRunning = "N"; - } - if (filterJobFinished == null) { - filterJobFinished = "N"; - } - if ("Y".equals(filterJobPending)) { - paramList.add("filterJobsWithPendingStatus=Y"); - filterExprs.add(EntityCondition.makeCondition("statusId", "SERVICE_PENDING")); - result.put("filterJobsWithPendingStatus", filterJobPending); - } - if ("Y".equals(filterJobRunning)) { - paramList.add("filterJobsWithRunningStatus=Y"); - filterExprs.add(EntityCondition.makeCondition("statusId", "SERVICE_RUNNING")); - result.put("filterJobsWithRunningStatus", filterJobRunning); - } - if ("Y".equals(filterJobFinished)) { - paramList.add("filterJobsWithFinishedStatus=Y"); - filterExprs.add(EntityCondition.makeCondition("statusId", "SERVICE_FINISHED")); - result.put("filterJobsWithFinishedStatus", filterJobFinished); - } - if (filterExprs.size() > 0) { - conditions.add(EntityCondition.makeCondition(filterExprs, EntityOperator.OR)); - } - // set distinct on so we only get one row per job - EntityFindOptions findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); - List<String> orderBy = UtilMisc.toList("-runTime"); - EntityCondition cond = null; - if (conditions.size() > 0) { - cond = EntityCondition.makeCondition(conditions); - } - if (cond != null || "Y".equals(showAll)) { - try { - eli = delegator.find("JobSandbox", cond, null, null, orderBy, findOpts); - - // get the indexes for the partial list - lowIndex = viewIndex * viewSize + 1; - highIndex = (viewIndex + 1) * viewSize; - - // get the partial list for this page - jobList = eli.getPartialList(lowIndex, viewSize); - - // attempt to get the full size - eli.last(); - jobListSize = eli.currentIndex(); - if (highIndex > jobListSize) { - highIndex = jobListSize; - } - eli.close(); - } catch (GenericEntityException e) { - String errMsg = "Failure in job find operation, rolling back transaction: " + e.toString(); - Debug.logError(e, errMsg, module); - return ServiceUtil.returnError(errMsg); - } - } else { - jobListSize = 0; - } - } - // create the result map - if (jobList == null) jobList = FastList.newInstance(); - String paramString = StringUtil.join(paramList, "&"); - result.put("paramList", (paramString != null ? paramString: "")); - result.put("lowIndex", lowIndex); - result.put("highIndex", highIndex); - result.put("jobs", jobList); - result.put("jobListSize", Integer.valueOf(jobListSize)); - return result; - } public static Map<String, Object> exportServiceEoModelBundle(DispatchContext dctx, Map<String, ? extends Object> context) { String eomodeldFullPath = (String) context.get("eomodeldFullPath"); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat Jan 3 06:33:01 2009 @@ -278,30 +278,34 @@ </request-map> <!-- Service Engine Info and Job Management Requests --> - <request-map uri="serviceList"> + <request-map uri="ServiceLog"> <security https="true" auth="true"/> - <response name="success" type="view" value="serviceList"/> + <response name="success" type="view" value="ServiceLog"/> + </request-map> + <request-map uri="ServiceList"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ServiceList"/> </request-map> <request-map uri="threadList"> <security https="true" auth="true"/> <response name="success" type="view" value="threadList"/> </request-map> - <request-map uri="jobList"> + <request-map uri="FindJob"> <security https="true" auth="true"/> - <response name="success" type="view" value="jobList"/> + <response name="success" type="view" value="FindJob"/> </request-map> <request-map uri="cancelJob"> <security https="true" auth="true"/> <event type="service" invoke="cancelScheduledJob"/> - <response name="success" type="view" value="jobList"/> - <response name="error" type="view" value="jobList"/> + <response name="success" type="view" value="FindJob"/> + <response name="error" type="view" value="FindJob"/> </request-map> <request-map uri="resetJob"> <security https="true" auth="true"/> <event type="service" invoke="resetScheduledJob"/> - <response name="success" type="view" value="jobList"/> - <response name="error" type="view" value="jobList"/> + <response name="success" type="view" value="FindJob"/> + <response name="error" type="view" value="FindJob"/> </request-map> <request-map uri="scheduleJob"> <security https="true" auth="true"/> @@ -322,7 +326,7 @@ <request-map uri="scheduleService"> <security https="true" auth="true"/> <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="scheduleService"/> - <response name="success" type="view" value="jobList"/> + <response name="success" type="view" value="FindJob"/> <response name="sync_success" type="view" value="serviceResult"/> <response name="error" type="view" value="scheduleJob"/> </request-map> @@ -338,10 +342,6 @@ </request-map> <!-- Available services requests --> - <request-map uri="availableServices"> - <security https="true" auth="true"/> - <response name="success" type="view" value="availableServices"/> - </request-map> <request-map uri="serviceEcaDetail"> <security https="true" auth="true"/> <response name="success" type="view" value="serviceEcaDetail"/> @@ -349,8 +349,8 @@ <request-map uri="exportServiceEoModelBundle"> <security https="true" auth="true"/> <event type="service" invoke="exportServiceEoModelBundle"/> - <response name="success" type="view" value="availableServices"/> - <response name="error" type="view" value="availableServices"/> + <response name="success" type="view" value="ServiceList"/> + <response name="error" type="view" value="ServiceList"/> </request-map> <!-- CustomTimePeriod requests --> @@ -576,15 +576,15 @@ <view-map name="EditCustomTimePeriod" type="screen" page="component://webtools/widget/MiscScreens.xml#EditCustomTimePeriod"/> - <view-map name="serviceList" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceList"/> - <view-map name="jobList" type="screen" page="component://webtools/widget/ServiceScreens.xml#JobList"/> + <view-map name="ServiceLog" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceLog"/> + <view-map name="ServiceList" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceList"/> + <view-map name="FindJob" type="screen" page="component://webtools/widget/ServiceScreens.xml#FindJob"/> <view-map name="serviceResult" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceResult"/> <view-map name="threadList" type="screen" page="component://webtools/widget/ServiceScreens.xml#ThreadList"/> <view-map name="scheduleJob" type="screen" page="component://webtools/widget/ServiceScreens.xml#ScheduleJob"/> <view-map name="runService" type="screen" page="component://webtools/widget/ServiceScreens.xml#RunService"/> <view-map name="setServiceParameters" type="screen" page="component://webtools/widget/ServiceScreens.xml#setServiceParameters"/> <view-map name="setSyncServiceParameters" type="screen" page="component://webtools/widget/ServiceScreens.xml#setSyncServiceParameters"/> - <view-map name="availableServices" type="screen" page="component://webtools/widget/AvailableServicesScreens.xml#AvailableServicesList"/> <view-map name="serviceEcaDetail" type="screen" page="component://webtools/widget/AvailableServicesScreens.xml#ServiceEcaDetail"/> <view-map name="printStart" type="screen" page="component://webtools/widget/CommonScreens.xml#printStart"/> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Sat Jan 3 06:33:01 2009 @@ -71,7 +71,7 @@ <li><h3>${uiLabelMap.WebtoolsGeneralArtifactInfoTools}</h3></li> <li><a href="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsArtifactInfo}</a></li> <li><a href="<@ofbizUrl>entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference} - Interactive</a></li> - <li><a href="<@ofbizUrl>availableServices</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li> + <li><a href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li> </#if> <#if security.hasPermission("ENTITY_MAINT", session)> <li><h3>${uiLabelMap.WebtoolsEntityEngineTools}</h3></li> @@ -107,12 +107,12 @@ </#if> <#if security.hasPermission("SERVICE_MAINT", session)> <li><h3>${uiLabelMap.WebtoolsServiceEngineTools}</h3></li> - <li><a href="<@ofbizUrl>availableServices</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li> + <li><a href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li> <li><a href="<@ofbizUrl>scheduleJob</@ofbizUrl>">${uiLabelMap.PageTitleScheduleJob}</a></li> <li><a href="<@ofbizUrl>runService</@ofbizUrl>">${uiLabelMap.PageTitleRunService}</a></li> - <li><a href="<@ofbizUrl>jobList</@ofbizUrl>">${uiLabelMap.PageTitleJobList}</a></li> + <li><a href="<@ofbizUrl>FindJob</@ofbizUrl>">${uiLabelMap.PageTitleJobList}</a></li> <li><a href="<@ofbizUrl>threadList</@ofbizUrl>">${uiLabelMap.PageTitleThreadList}</a></li> - <li><a href="<@ofbizUrl>serviceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceLog}</a></li> + <li><a href="<@ofbizUrl>ServiceLog</@ofbizUrl>">${uiLabelMap.WebtoolsServiceLog}</a></li> </#if> <#if security.hasPermission("WORKFLOW_MAINT", session)> <li><h3>${uiLabelMap.WebtoolsWorkflowEngineTools}</h3></li> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml Sat Jan 3 06:33:01 2009 @@ -54,36 +54,43 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - <form name="findJob" title="" type="single" target="jobList?hideFields=Y&lookupFlag=Y" list-name="jobs" - header-row-style="header-row" default-table-style="basic-table"> - <!--field name="lookupFlag"><hidden value="Y"/></field--> - <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text/></field> - <field name="jobId" title="${uiLabelMap.CommonId}"><text/></field> - <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><text/></field> - <field name="filterJobsWithRunningStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsRunningStatus}"><check/></field> - <field name="filterJobsWithPendingStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsPendingStatus}"><check/></field> - <field name="filterJobsWithFinishedStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsFinishedStatus}"><check/></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> - <field name="" widget-style="buttontext"> - <hyperlink target="jobList?showAll=Y&hideFields=Y&lookupFlag=Y" description="${uiLabelMap.CommonShowAllRecords}"/> + <form name="FindJobs" type="single" target="FindJob" default-entity-name="JobSandbox"> + <field name="noConditionFind"><hidden value="Y"/></field> + <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><text-find/></field> + <field name="jobId" title="${uiLabelMap.CommonId}"><text-find/></field> + <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text-find/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> + <drop-down allow-empty="true" current-description=""> + <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"> + <entity-constraint name="statusTypeId" operator="equals" value="SERVICE_STATUS"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> </field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="JobList" title="" target="" type="list" list-name="jobs" - paginate-target="jobList" override-list-size="${jobListSize}" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><display/></field> - <field name="jobId" title="${uiLabelMap.CommonId}"><display/></field> - <field name="poolId" title="${uiLabelMap.WebtoolsPool}"><display/></field> - <field name="runTime" title="${uiLabelMap.WebtoolsRunTime}"><display/></field> - <field name="startDateTime" title="${uiLabelMap.CommonStartDateTime}"><display/></field> - <field name="serviceName" title="${uiLabelMap.WebtoolsService}"> - <hyperlink also-hidden="false" description="${serviceName}" target="availableServices?sel_service_name=${serviceName}"/> + <form name="ListJobs" type="list" list-name="listIt" paginate-target="FindJob" default-entity-name="JobSandbox" separate-columns="true" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> + <field-map field-name="inputFields" env-name="jobCtx"/> + <field-map field-name="entityName" value="JobSandbox"/> + <field-map field-name="orderBy" env-name="parameters.sortField"/> + </service> + </actions> + <field name="jobName" title="${uiLabelMap.WebtoolsJob}" sort-field="true"><display/></field> + <field name="jobId" title="${uiLabelMap.CommonId}" sort-field="true"><display/></field> + <field name="poolId" title="${uiLabelMap.WebtoolsPool}" sort-field="true"><display/></field> + <field name="runTime" title="${uiLabelMap.WebtoolsRunTime}" sort-field="true"><display/></field> + <field name="startDateTime" title="${uiLabelMap.CommonStartDateTime}" sort-field="true"><display/></field> + <field name="serviceName" title="${uiLabelMap.WebtoolsService}" sort-field="true"> + <hyperlink also-hidden="false" description="${serviceName}" target="ServiceList?sel_service_name=${serviceName}"/> </field> - <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field> - <field name="cancelDateTime" title="${uiLabelMap.CommonEndDateTime}"><display/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field> + <field name="cancelDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field> <field name="cancelButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="startDateTime==null&&finishDateTime==null&&cancelDateTime==null" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob?jobId=${jobId}"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Sat Jan 3 06:33:01 2009 @@ -19,7 +19,7 @@ <#--Dispatcher Name: ${dispatcherName?default(uiLabelMap.CommonNA)} --> -<#assign url='availableServices'> +<#assign url='ServiceList'> <#assign popupUrl='serviceEcaDetail'> <#-- Selected Service is available --> Modified: ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml Sat Jan 3 06:33:01 2009 @@ -20,37 +20,11 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="AvailableServicesList"> - <section> - <actions> - <set field="titleProperty" value="WebtoolsServiceReference"/> - <set field="appButtonItem" value="service"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <platform-specific> - <html> - <html-template location="component://webtools/webapp/webtools/service/availableservices.ftl"/> - </html> - </platform-specific> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="ServiceEcaDetail"> <section> <actions> <set field="titleProperty" value="WebtoolsServiceReference"/> <set field="appButtonItem" value="service"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sat Jan 3 06:33:01 2009 @@ -28,7 +28,6 @@ <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.WebtoolsCompanyName" global="true"/> - <set field="layoutSettings.companyName" from-field="uiLabelMap.WebtoolsCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WebtoolsCompanySubtitle" global="true"/> <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. --> @@ -36,13 +35,10 @@ <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> --> <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> --> <set field="activeApp" value="webtools" global="true"/> - <set field="appheaderTemplate" value="component://webtools/webapp/webtools/includes/appheader.ftl" global="true"/> + <!-- <set field="appheaderTemplate" value="component://webtools/webapp/webtools/includes/appheader.ftl" global="true"/> --> - <!-- can put this back in later once it is finished - <set field="applicationMenuLocation" value="component://webtools/widget/WebToolsMenus.xml" global="true"/> + <set field="applicationMenuLocation" value="component://webtools/widget/Menus.xml" global="true"/> <set field="applicationMenuName" value="WebtoolsAppBar" global="true"/> - <set field="applicationTitle" value="Webtools" global="true"/> - --> </actions> <widgets> <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> @@ -96,4 +92,59 @@ </widgets> </section> </screen> + + <screen name="CommonEntityDecorator"> + <section> + <actions> + <set field="headerItem" value="entity"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <!-- do check for WEBTOOLS, _VIEW permission --> + <condition> + <if-has-permission permission="ENTITY_MAINT"/> + </condition> + <widgets> + <include-menu name="EntityTabBar" location="component://webtools/widget/Menus.xml"/> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="CommonServiceDecorator"> + <section> + <actions> + <set field="headerItem" value="service"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <!-- do check for WEBTOOLS, _VIEW permission --> + <condition> + <if-has-permission permission="WEBTOOLS" action="_VIEW"/> + </condition> + <widgets> + <include-menu name="serviceTabBar" location="component://webtools/widget/Menus.xml"/> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + </screens> Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sat Jan 3 06:33:01 2009 @@ -20,13 +20,12 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <screen name="EntitySQLProcessor"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <set field="titleProperty" value="PageTitleEntitySQLProcessor"/> + <set field="tabButtonItem" value="EntitySQLProcessor"/> <set field="labelTitleProperty" value="PageTitleEntitySQLProcessor"/> <set field="sqlCommand" from-field="parameters.sqlCommand"/> <set field="selGroup" from-field="parameters.group"/> @@ -36,7 +35,7 @@ <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntitySQLProcessor.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/EntitySQLProcessor.ftl"/></html> @@ -44,23 +43,18 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> <screen name="EntityExportAll"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <set field="titleProperty" value="PageTitleEntityExportAll"/> + <set field="tabButtonItem" value="entityExportAll"/> <set field="parameters.TRANSACTION_TIMEOUT" value="7200"/> <set field="results" from-field="parameters.results"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -81,24 +75,19 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> <screen name="EntityImportDir"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <set field="titleProperty" value="PageTitleEntityImportDir"/> + <set field="tabButtonItem" value="entityImportDir"/> <set field="parameters.TRANSACTION_TIMEOUT" value="7200"/> <set field="messages" from-field="parameters.messages"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -119,24 +108,19 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> <screen name="EntityImport"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <set field="titleProperty" value="PageTitleEntityImport"/> + <set field="tabButtonItem" value="entityImport"/> <set field="parameters.TRANSACTION_TIMEOUT" value="7200"/> <set field="messages" from-field="parameters.messages"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -157,24 +141,19 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> <screen name="EntityImportReaders"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <set field="titleProperty" value="PageTitleEntityImportReaders"/> + <set field="tabButtonItem" value="entityImportReaders"/> <set field="parameters.TRANSACTION_TIMEOUT" value="7200"/> <set field="messages" from-field="parameters.messages"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -195,22 +174,18 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> + <screen name="EntityMaint"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <set field="titleProperty" value="WebtoolsEntityDataMaintenance"/> + <set field="tabButtonItem" value="entitymaint"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/EntityMaint.ftl"/></html> @@ -218,11 +193,9 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> + <screen name="FindGeneric"> <section> <condition> @@ -400,9 +373,11 @@ <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> + <set field="titleProperty" value="PageTitleEntitySQLProcessor___"/> + <set field="tabButtonItem" value="entityEoModelBundle"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <include-form name="EntityEoModelBundle" location="component://webtools/widget/EntityForms.xml"/> </decorator-section> @@ -413,16 +388,14 @@ <screen name="CheckDb"> <section> - <condition> - <if-has-permission permission="ENTITY_MAINT"/> - </condition> <actions> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="WebtoolsCheckUpdateDatabase"/> + <set field="tabButtonItem" value="checkDb"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -443,9 +416,6 @@ </decorator-section> </decorator-screen> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </screen> <screen name="EntityPerformanceTest"> @@ -470,12 +440,12 @@ <section> <actions> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> - <set field="headerItem" value="main"/> <set field="titleProperty" value="PageTitleEntityExport"/> + <set field="tabButtonItem" value="xmlDsDump"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -535,3 +505,4 @@ </screen> </screens> + Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml Sat Jan 3 06:33:01 2009 @@ -52,10 +52,14 @@ <section> <actions> <set field="titleProperty" value="PageTitleEntitySyncStatus"/> + <set field="tabButtonItem" value="entitySyncStatus"/> </actions> <widgets> - <decorator-screen name="GenericDecorator"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> + <container style="button-bar"> + <link target="EntitySyncStatus" style="smallSubmit" text="${uiLabelMap.CommonRefresh}"/> + </container> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> @@ -92,3 +96,4 @@ </screens> + Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sat Jan 3 06:33:01 2009 @@ -33,7 +33,7 @@ <if-has-permission permission="WEBTOOLS" action="_VIEW"/> </condition> <widgets> - <include-menu location="component://webtools/widget/WebToolsMenus.xml" name="LoggingTabBar"/> + <include-menu location="component://webtools/widget/Menus.xml" name="LoggingTabBar"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/Menus.xml (original) +++ ofbiz/trunk/framework/webtools/widget/Menus.xml Sat Jan 3 06:33:01 2009 @@ -19,23 +19,128 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> + + <menu name="WebtoolsAppBar" title="${uiLabelMap.FrameworkWebTools}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheMaintenance}"> + <link target="FindUtilCache"/> + </menu-item> + <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngineTools}"> + <link target="entitymaint"/> + </menu-item> + <menu-item name="service" title="${uiLabelMap.WebtoolsServiceEngineTools}"> + <link target="ServiceList"/> + </menu-item> + <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}"> + <link target="LogView"/> + </menu-item> +<!-- + <menu-item name="workflow" title="Workflow"> + <link target="workflowMonitor"/> + </menu-item> +--> + <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}"> + <link target="viewdatafile"/> + </menu-item> + <menu-item name="ArtifactInfo" title="${uiLabelMap.WebtoolsArtifactInfo}"> + <link target="ArtifactInfo"/> + </menu-item> + <menu-item name="tempexpr" title="${uiLabelMap.TemporalExpression}"> + <link target="findTemporalExpression"/> + </menu-item> + <menu-item name="stats" title="${uiLabelMap.WebtoolsStatsSinceServerStart}"> + <link target="StatsSinceStart"/> + </menu-item> + </menu> + <menu name="serviceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="page.tabButtonItem"> - <menu-item name="ServiceList" title="${uiLabelMap.WebtoolsServiceList}"> - <link target="serviceList"/> + <menu-item name="serviceList" title="${uiLabelMap.WebtoolsServiceReference}"> + <link target="ServiceList"/> </menu-item> - <menu-item name="JobList" title="${uiLabelMap.WebtoolsJobList}"> - <link target="jobList"/> + <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}"> + <link target="ServiceLog"/> </menu-item> - <menu-item name="ThreadList" title="${uiLabelMap.WebtoolsThreadList}"> + <menu-item name="findJob" title="${uiLabelMap.WebtoolsJobList}"> + <link target="FindJob"/> + </menu-item> + <menu-item name="threadList" title="${uiLabelMap.WebtoolsThreadList}"> <link target="threadList"/> </menu-item> - <menu-item name="ScheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}"> + <menu-item name="scheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}"> <link target="scheduleJob"/> </menu-item> - <menu-item name="RunService" title="${uiLabelMap.PageTitleRunService}"> + <menu-item name="runService" title="${uiLabelMap.PageTitleRunService}"> <link target="runService"/> </menu-item> </menu> + <menu name="LoggingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" + selected-menuitem-context-field-name="logMenuItem"> + <menu-item name="viewLog" title="${uiLabelMap.WebtoolsViewLog}"> + <link target="LogView"/> + </menu-item> + <menu-item name="logConfiguration" title="${uiLabelMap.PageTitleLogConfiguration}"> + <link target="LogConfiguration"/> + </menu-item> + </menu> + + <menu name="TempExprTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" + selected-menuitem-context-field-name="tabMenuItem"> + <menu-item name="findExpression" title="${uiLabelMap.CommonFind}"> + <link target="findTemporalExpression"/> + </menu-item> + <menu-item name="editExpression" title="${uiLabelMap.CommonEdit}"> + <condition> + <not><if-empty field-name="temporalExpression"/></not> + </condition> + <link target="editTemporalExpression?tempExprId=${temporalExpression.tempExprId}"/> + </menu-item> + </menu> + + <menu name="EntityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="entitymaint" title="${uiLabelMap.WebtoolsEntityDataMaintenance}"> + <link target="entitymaint"/> + </menu-item> + <menu-item name="entityref" title="${uiLabelMap.WebtoolsEntityReference} - Interactive"> + <link target="entityref" target-window="_BLANK"/> + </menu-item> + <menu-item name="entityrefStatic" title="${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}"> + <link target="entityref?forstatic=true" target-window="_BLANK"/> + </menu-item> + <menu-item name="entityrefReport" title="${uiLabelMap.WebtoolsEntityReferencePdf}"> + <link target="entityrefReport" target-window="_BLANK"/> + </menu-item> + <menu-item name="EntitySQLProcessor" title="${uiLabelMap.PageTitleEntitySQLProcessor}"> + <link target="EntitySQLProcessor"/> + </menu-item> + <menu-item name="entitySyncStatus" title="${uiLabelMap.WebtoolsEntitySyncStatus}"> + <link target="EntitySyncStatus"/> + </menu-item> + <menu-item name="modelInduceFromDb" title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}"> + <link target="view/ModelInduceFromDb"/> + </menu-item> + <menu-item name="entityEoModelBundle" title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}"> + <link target="EntityEoModelBundle"/> + </menu-item> + <menu-item name="checkDb" title="${uiLabelMap.WebtoolsCheckUpdateDatabase}"> + <link target="view/checkdb"/> + </menu-item> + + <menu-item name="xmlDsDump" title="${uiLabelMap.PageTitleEntityExport}"> + <link target="xmldsdump"/> + </menu-item> + <menu-item name="entityExportAll" title="${uiLabelMap.PageTitleEntityExportAll}"> + <link target="EntityExportAll"/> + </menu-item> + <menu-item name="entityImport" title="${uiLabelMap.PageTitleEntityImport}"> + <link target="EntityImport"/> + </menu-item> + <menu-item name="entityImportDir" title="${uiLabelMap.PageTitleEntityImportDir}"> + <link target="EntityImportDir"/> + </menu-item> + <menu-item name="entityImportReaders" title="${uiLabelMap.PageTitleEntityImportReaders}"> + <link target="EntityImportReaders"/> + </menu-item> + </menu> + </menus> Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=730990&r1=730989&r2=730990&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sat Jan 3 06:33:01 2009 @@ -21,28 +21,24 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="CommonServiceDecorator"> + <screen name="ServiceList"> <section> <actions> - <set field="headerItem" value="jobs"/> + <set field="titleProperty" value="PageTitleServiceList"/> + <set field="tabButtonItem" value="serviceList"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonServiceDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <section> - <!-- do check for WEBTOOLS, _VIEW permission --> - <condition> - <if-has-permission permission="WEBTOOLS" action="_VIEW"/> - </condition> <widgets> - <include-menu name="serviceTabBar" location="component://webtools/widget/Menus.xml"/> - - <decorator-section-include name="body"/> - + <platform-specific> + <html> + <html-template location="component://webtools/webapp/webtools/service/availableservices.ftl"/> + </html> + </platform-specific> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> - </fail-widgets> </section> </decorator-section> </decorator-screen> @@ -50,15 +46,15 @@ </section> </screen> - <screen name="ServiceList"> + <screen name="ServiceLog"> <section> <actions> <set field="titleProperty" value="PageTitleServiceList"/> - <set field="tabButtonItem" value="ServiceList"/> + <set field="tabButtonItem" value="serviceLog"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy"/> </actions> <widgets> - <decorator-screen name="CommonServiceDecorator"> + <decorator-screen name="CommonServiceDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/service/services.ftl"/></html> @@ -68,52 +64,44 @@ </widgets> </section> </screen> - <screen name="JobList"> + + <screen name="FindJob"> <section> <actions> <set field="titleProperty" value="PageTitleJobList"/> - <set field="tabButtonItem" value="JobList"/> - <!--<limit-range start="0" size="100"/>--> - <service service-name="jobList" auto-field-map="parameters"/> + <set field="tabButtonItem" value="findJob"/> + <set field="jobCtx" from-field="parameters"/> </actions> <widgets> - <decorator-screen name="CommonServiceDecorator"> + <decorator-screen name="CommonServiceDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <container style="screenlet"> - <include-menu location="component://webtools/widget/WebToolsMenus.xml" name="FindJobsTitleBar"/> - <container style="screenlet-body"> - <section> - <condition> - <if-compare field-name="parameters.hideFields" operator="not-equals" value="Y"/> - </condition> - <widgets> - <include-form name="findJob" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="h3">${uiLabelMap.PageTitleJobList}</label> - </container> - <container style="screenlet-body"> - <include-form name="JobList" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> - </container> - </container> + <section> + <widgets> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindJobs" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListJobs" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="ThreadList"> <section> <actions> <set field="titleProperty" value="PageTitleThreadList"/> - <set field="tabButtonItem" value="ThreadList"/> + <set field="tabButtonItem" value="threadList"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/Threads.groovy"/> </actions> <widgets> - <decorator-screen name="CommonServiceDecorator"> + <decorator-screen name="CommonServiceDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/service/threads.ftl"/></html> @@ -127,11 +115,11 @@ <section> <actions> <set field="titleProperty" value="PageTitleScheduleJob"/> - <set field="tabButtonItem" value="ScheduleJob"/> + <set field="tabButtonItem" value="scheduleJob"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/> </actions> <widgets> - <decorator-screen name="CommonServiceDecorator"> + <decorator-screen name="CommonServiceDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -157,11 +145,11 @@ <section> <actions> <set field="titleProperty" value="PageTitleRunService"/> - <set field="tabButtonItem" value="RunService"/> + <set field="tabButtonItem" value="runService"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/> </actions> <widgets> - <decorator-screen name="CommonServiceDecorator"> + <decorator-screen name="CommonServiceDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |