svn commit: r1042964 [5/9] - in /ofbiz/branches/jquery: ./ applications/accounting/data/ applications/accounting/servic
Locked
svn commit: r1042964 [5/9] - in /ofbiz/branches/jquery: ./ applications/accounting/data/ applications/accounting/servic
 
|
Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml Tue Dec 7 10:42:16 2010 @@ -498,7 +498,7 @@ <field name="emailType" title="${uiLabelMap.CommonEmailType}"> <drop-down> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> - <entity-constraint name="enumTypeId" value="PRDS_EMAIL"/> + <entity-constraint name="enumTypeId" operator="in" value="PRDS_EMAIL,PARTY_EMAIL"/> <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> Modified: ofbiz/branches/jquery/applications/product/widget/facility/ShipmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/ShipmentForms.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/ShipmentForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/ShipmentForms.xml Tue Dec 7 10:42:16 2010 @@ -38,7 +38,7 @@ under the License. <field use-when="shipment==null" name="statusId" title="${uiLabelMap.ProductStatusId}"> <drop-down allow-empty="false" current="first-in-list"> <entity-options entity-name="StatusItem" description="${description}"> - <entity-constraint name="statusTypeId" value="${statusItemType}"/> + <entity-constraint name="statusTypeId" value="${statusItemTypeId}"/> <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> @@ -116,9 +116,8 @@ under the License. <field name="destinationTelecomNumberId" title="${uiLabelMap.ProductDestinationPhoneNumberId}" tooltip="${destinationTelecomNumber.countryCode} ${destinationTelecomNumber.areaCode} ${destinationTelecomNumber.contactNumber}"> </field> - - <field name="partyIdTo" title="${uiLabelMap.ProductToParty}" tooltip="${toPerson.firstName} ${toPerson.middleName} ${toPerson.lastName} ${toPartyGroup.groupName}"/> - <field name="partyIdFrom" title="${uiLabelMap.ProductFromParty}" tooltip="${fromPerson.firstName} ${fromPerson.middleName} ${fromPerson.lastName} ${fromPartyGroup.groupName}"/> + <field name="partyIdTo" title="${uiLabelMap.ProductToParty}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdFrom" title="${uiLabelMap.ProductFromParty}"><lookup target-form-name="LookupPartyName"/></field> <field name="additionalShippingCharge" title="${uiLabelMap.ProductAdditionalShippingCharge}"><text/></field> Modified: ofbiz/branches/jquery/applications/product/widget/facility/ShipmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/ShipmentScreens.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/ShipmentScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/ShipmentScreens.xml Tue Dec 7 10:42:16 2010 @@ -187,9 +187,7 @@ under the License. <widgets> <decorator-screen name="CommonShipmentDecorator"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://product/webapp/facility/shipment/EditShipment.ftl"/></html> - </platform-specific> + <include-form name="EditShipment" location="component://product/widget/facility/ShipmentForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties (original) +++ ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties Tue Dec 7 10:42:16 2010 @@ -22,7 +22,7 @@ # An example can be found in applications/workeffort/data/WorkEffortTypeData.xml # The "from" address for emailed calendar event reminders -eventReminders.emailFromAddress=[hidden email] +eventReminders.emailFromAddress=[hidden email] # The screen widget used for emailed calendar event reminders. The parameters Map # passed to the screen widget will contain the workEffortId, the event date/time, # the locale, and the time zone specified in the reminder. Modified: ofbiz/branches/jquery/applications/workeffort/data/WorkEffortSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/data/WorkEffortSecurityData.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/data/WorkEffortSecurityData.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/data/WorkEffortSecurityData.xml Tue Dec 7 10:42:16 2010 @@ -43,9 +43,13 @@ under the License. <SecurityGroupPermission groupId="BIZADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> <SecurityGroup groupId="WORKEFFORT_USER" description="WorkEffort user group; all limited workeffort permissions."/> + <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_VIEW"/> <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_VIEW"/> <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_CREATE"/> <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_UPDATE"/> <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_DELETE"/> + <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="OFBTOOLS_VIEW"/> + <SecurityGroup description="WorkEffort Admin group, has all workeffort permissions." groupId="WORKEFFORTADMIN"/> + <SecurityGroupPermission groupId="WORKEFFORTADMIN" permissionId="WORKEFFORTMGR_ADMIN"/> </entity-engine-xml> Modified: ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml Tue Dec 7 10:42:16 2010 @@ -241,6 +241,6 @@ under the License. <ContactMechTypePurpose contactMechPurposeTypeId="ICAL_URL" contactMechTypeId="WEB_ADDRESS"/> <!-- WorkEffort Email Template Settings --> - <EmailTemplateSetting emailTemplateSettingId="WEFF_EVENT_REMINDER" description="" fromAddress="[hidden email]" subject="Event Reminder" + <EmailTemplateSetting emailTemplateSettingId="WEFF_EVENT_REMINDER" description="" fromAddress="[hidden email]" subject="Event Reminder" bodyScreenLocation="component://workeffort/widget/WorkEffortScreens.xml#WorkEffortEventReminderEmail"/> </entity-engine-xml> Modified: ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java Tue Dec 7 10:42:16 2010 @@ -509,7 +509,7 @@ public class ICalConverter { if (UtilValidate.isEmpty(property.getValue())) { try { // RFC 2445 4.8.4.1 and 4.8.4.3 Value must be a URL - property.setValue("MAILTO:[hidden email]"); + property.setValue("MAILTO:[hidden email]"); } catch (Exception e) { Debug.logError(e, "Error while setting Property value: ", module); } Modified: ofbiz/branches/jquery/debian/TODO URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/debian/TODO?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/debian/TODO (original) +++ ofbiz/branches/jquery/debian/TODO Tue Dec 7 10:42:16 2010 @@ -19,7 +19,7 @@ * debian/copyright - Prompt for: - ofbiz admin password(s) - - default email([hidden email]) + - default email([hidden email]) - install of demo or just seed data * Auto-generate admin key/port * Move demo data into separate package? Modified: ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init (original) +++ ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init Tue Dec 7 10:42:16 2010 @@ -272,7 +272,7 @@ stop() { esac wait_for_stop if [ -e "$PIDFILE" ]; then - rm "$PIDFILE" + rm -f "$PIDFILE" fi } Modified: ofbiz/branches/jquery/debian/override-data.xslt URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/debian/override-data.xslt?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/debian/override-data.xslt (original) +++ ofbiz/branches/jquery/debian/override-data.xslt Tue Dec 7 10:42:16 2010 @@ -108,13 +108,13 @@ under the License. <xsl:template mode="data" match=" ProductStoreEmailSetting[ - @bccAddress='[hidden email]' or - @fromAddress='[hidden email]']|ContactList[ - @verifyEmailFrom='[hidden email]' + @bccAddress='[hidden email]' or + @fromAddress='[hidden email]']|ContactList[ + @verifyEmailFrom='[hidden email]' ]|ContactMech[ - @infoString='[hidden email]' + @infoString='[hidden email]' ]|WorkflowDataField[ - @initialValue='[hidden email]' + @initialValue='[hidden email]' ]|UserLogin[ @currentPassword='47ca69ebb4bdc9ae0adec130880165d2cc05db1a' ]"> @@ -126,7 +126,7 @@ under the License. <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress|ProductStoreEmailSetting/@fromAddress|ProductStoreEmailSetting/@verifyEmailFrom|ContactMech/@infoString|ContactList/@verifyEmailFrom|WorkflowDataField/@initialValue"> <xsl:attribute name="{name()}"> <xsl:choose> - <xsl:when test=". = '[hidden email]'"><xsl:value-of select="$fromemail"/></xsl:when> + <xsl:when test=". = '[hidden email]'"><xsl:value-of select="$fromemail"/></xsl:when> <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise> </xsl:choose> </xsl:attribute> Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java Tue Dec 7 10:42:16 2010 @@ -38,6 +38,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.nio.ByteBuffer; +import java.nio.CharBuffer; import java.nio.charset.Charset; import org.apache.commons.io.IOUtils; @@ -52,6 +53,69 @@ public final class UtilIO { public static final Charset UTF8 = Charset.forName("UTF-8"); public static final String module = UtilIO.class.getName(); + /** Copy an InputStream to an OutputStream, optionally closing either + * the input or the output. + * + * @param in the InputStream to copy from + * @param closeIn whether to close the input when the copy is done + * @param out the OutputStream to copy to + * @param closeOut whether to close the output when the copy is done + * @throws IOException if an error occurs + */ + public static void copy(InputStream in, boolean closeIn, OutputStream out, boolean closeOut) throws IOException { + try { + try { + IOUtils.copy(in, out); + } finally { + if (closeIn) IOUtils.closeQuietly(in); + } + } finally { + if (closeOut) IOUtils.closeQuietly(out); + } + } + + /** Copy a Reader to a Writer, optionally closing either the input or + * the output. + * + * @param reader the Reader to copy from + * @param closeIn whether to close the input when the copy is done + * @param writer the Writer to copy to + * @param closeOut whether to close the output when the copy is done + * @throws IOException if an error occurs + */ + public static void copy(Reader reader, boolean closeIn, Writer writer, boolean closeOut) throws IOException { + try { + try { + IOUtils.copy(reader, writer); + } finally { + if (closeIn) IOUtils.closeQuietly(reader); + } + } finally { + if (closeOut) IOUtils.closeQuietly(writer); + } + } + + /** Copy a Reader to an Appendable, optionally closing the input. + * + * @param reader the Reader to copy from + * @param closeIn whether to close the input when the copy is done + * @param out the Appendable to copy to + * @throws IOException if an error occurs + */ + public static void copy(Reader reader, boolean closeIn, Appendable out) throws IOException { + try { + CharBuffer buffer = CharBuffer.allocate(4096); + int r; + while ((r = reader.read(buffer)) != -1) { + buffer.rewind(); + out.append(buffer); + buffer.flip(); + } + } finally { + if (closeIn) IOUtils.closeQuietly(reader); + } + } + /** Convert a byte array to a string; consistently uses \n line endings * in java. This uses a default {@link Charset UTF-8} charset. * Modified: ofbiz/branches/jquery/framework/common/config/general.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/general.properties?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/general.properties (original) +++ ofbiz/branches/jquery/framework/common/config/general.properties Tue Dec 7 10:42:16 2010 @@ -65,7 +65,7 @@ partner.trackingCodeId.default= usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$) # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting -defaultFromEmailAddress=[hidden email] +defaultFromEmailAddress=[hidden email] # -- The default domainname used in the notification emails links # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file. Modified: ofbiz/branches/jquery/framework/common/data/UnitData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/data/UnitData.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/data/UnitData.xml (original) +++ ofbiz/branches/jquery/framework/common/data/UnitData.xml Tue Dec 7 10:42:16 2010 @@ -315,4 +315,6 @@ under the License. <Uom abbreviation="ea" description="Each" uomId="OTH_ea" uomTypeId="OTHER_MEASURE"/> <Uom abbreviation="pp" description="Per Person" uomId="OTH_pp" uomTypeId="OTHER_MEASURE"/> + <Uom abbreviation="bx" description="Box" uomId="OTH_box" uomTypeId="OTHER_MEASURE"/> + <Uom abbreviation="pk" description="Package" uomId="OTH_pk" uomTypeId="OTHER_MEASURE"/> </entity-engine-xml> Modified: ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original) +++ ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml Tue Dec 7 10:42:16 2010 @@ -50,7 +50,7 @@ under the License. <if-not-empty field="emailTemplateSetting.fromAddress"> <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/> <else> - <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="[hidden email]"/> + <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="[hidden email]"/> </else> </if-not-empty> <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/> Modified: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/FindServices.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/FindServices.java Tue Dec 7 10:42:16 2010 @@ -266,7 +266,7 @@ public class FindServices { if (fieldValue == null) { fieldValue = parameters.get(fieldName); } - if (ObjectType.isEmpty(fieldValue)) { + if (ObjectType.isEmpty(fieldValue) && !"empty".equals(operation)) { continue; } result.add(createSingleCondition(modelField, operation, fieldValue, ignoreCase, delegator, context)); @@ -372,10 +372,11 @@ public class FindServices { } subMap2 = subMap.get("fld0"); fieldValue = subMap2.get("value"); - if (fieldValue == null) { + opString = (String) subMap2.get("op"); + // null fieldValue is OK if operator is "empty" + if (fieldValue == null && !"empty".equals(opString)) { continue; } - opString = (String) subMap2.get("op"); ignoreCase = "Y".equals(subMap2.get("ic")); cond = createSingleCondition(modelField, opString, fieldValue, ignoreCase, delegator, context); tmpList.add(cond); @@ -384,10 +385,10 @@ public class FindServices { continue; } fieldValue = subMap2.get("value"); - if (fieldValue == null) { + opString = (String) subMap2.get("op"); + if (fieldValue == null && !"empty".equals(opString)) { continue; } - opString = (String) subMap2.get("op"); ignoreCase = "Y".equals(subMap2.get("ic")); cond = createSingleCondition(modelField, opString, fieldValue, ignoreCase, delegator, context); tmpList.add(cond); Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 7 10:42:16 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1040441 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1042956 Modified: ofbiz/branches/jquery/framework/entity/dtd/entitymodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/dtd/entitymodel.xsd?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/dtd/entitymodel.xsd (original) +++ ofbiz/branches/jquery/framework/entity/dtd/entitymodel.xsd Tue Dec 7 10:42:16 2010 @@ -90,6 +90,7 @@ under the License. <xs:attribute name="enable-lock" default="false" type="boolean"/> <xs:attribute name="no-auto-stamp" default="false" type="boolean"/> <xs:attribute name="never-cache" default="false" type="boolean"/> + <xs:attribute name="never-check" default="false" type="boolean"/> <xs:attribute name="auto-clear-cache" default="true" type="boolean"/> <xs:attribute name="title" type="xs:string"/> <xs:attribute name="copyright" type="xs:string"/> Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Tue Dec 7 10:42:16 2010 @@ -650,12 +650,13 @@ public class GenericDAO { if (UtilValidate.isNotEmpty(fieldsToSelect)) { Set<String> tempKeys = FastSet.newInstance(); tempKeys.addAll(fieldsToSelect); - Iterator<ModelField> fieldIter = modelEntity.getFieldsIterator(); - while (fieldIter.hasNext()) { - ModelField curField = fieldIter.next(); - if (tempKeys.contains(curField.getName())) { - selectFields.add(curField); - tempKeys.remove(curField.getName()); + for (String fieldToSelect : fieldsToSelect) { + if (tempKeys.contains(fieldToSelect)) { + ModelField curField = modelEntity.getField(fieldToSelect); + if (curField != null) { + selectFields.add(curField); + tempKeys.remove(fieldToSelect); + } } } Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Tue Dec 7 10:42:16 2010 @@ -205,6 +205,12 @@ public class DatabaseUtil { String entMessage = "(" + timer.timeSinceLast() + "ms) NOT Checking #" + curEnt + "/" + totalEnt + " View Entity " + entity.getEntityName(); Debug.logVerbose(entMessage, module); if (messages != null) messages.add(entMessage); + continue; + // if never-check is set then don't check it either + } else if (entity.getNeverCheck()) { + String entMessage = "(" + timer.timeSinceLast() + "ms) NOT Checking #" + curEnt + "/" + totalEnt + " Entity " + entity.getEntityName(); + Debug.logVerbose(entMessage, module); + if (messages != null) messages.add(entMessage); continue; } Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Tue Dec 7 10:42:16 2010 @@ -123,6 +123,7 @@ public class ModelEntity extends ModelIn * from cache on read showing a warning messages to that effect */ protected boolean neverCache = false; + protected boolean neverCheck = false; protected boolean autoClearCache = true; @@ -257,6 +258,7 @@ public class ModelEntity extends ModelIn this.doLock = UtilXml.checkBoolean(entityElement.getAttribute("enable-lock"), false); this.noAutoStamp = UtilXml.checkBoolean(entityElement.getAttribute("no-auto-stamp"), false); this.neverCache = UtilXml.checkBoolean(entityElement.getAttribute("never-cache"), false); + this.neverCheck = UtilXml.checkBoolean(entityElement.getAttribute("never-check"), false); this.autoClearCache = UtilXml.checkBoolean(entityElement.getAttribute("auto-clear-cache"), true); String sequenceBankSizeStr = UtilXml.checkEmpty(entityElement.getAttribute("sequence-bank-size")); @@ -368,7 +370,7 @@ public class ModelEntity extends ModelIn /** The table-name of the Entity including a Schema name if specified in the datasource config */ public String getTableName(DatasourceInfo datasourceInfo) { - if (UtilValidate.isNotEmpty(datasourceInfo.schemaName)) { + if (datasourceInfo != null && UtilValidate.isNotEmpty(datasourceInfo.schemaName)) { return datasourceInfo.schemaName + "." + this.tableName; } else { return this.tableName; @@ -408,7 +410,20 @@ public class ModelEntity extends ModelIn public void setNeverCache(boolean neverCache) { this.neverCache = neverCache; } - + + /** + * An indicator to specific if this entity should ignore automatic DB checks. + * This should be set when the entity is mapped to a database view to prevent + * warnings and attempts to modify the schema. + */ + public boolean getNeverCheck() { + return neverCheck; + } + + public void setNeverCheck(boolean neverCheck) { + this.neverCheck = neverCheck; + } + public boolean getAutoClearCache() { return this.autoClearCache; } @@ -1410,6 +1425,10 @@ public class ModelEntity extends ModelIn if (this.getNeverCache()) { root.setAttribute("never-cache", "true"); } + + if (this.getNeverCheck()) { + root.setAttribute("never-check", "true"); + } if (!this.getAutoClearCache()) { root.setAttribute("auto-clear-cache", "false"); Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java Tue Dec 7 10:42:16 2010 @@ -94,6 +94,12 @@ public class ModelEntityChecker { if (entity.getPlainTableName() != null && reservedWords.contains(entity.getPlainTableName().toUpperCase())) { warningList.add("[TableNameRW] Table name [" + entity.getPlainTableName() + "] of entity " + entity.getEntityName() + " is a reserved word."); } + + // don't check columns/relations/keys when never-check is set to "true" + if (entity.getNeverCheck()) { + continue; + } + TreeSet<String> ufields = new TreeSet<String>(); Iterator<ModelField> fieldIter = entity.getFieldsIterator(); while (fieldIter.hasNext()) { Modified: ofbiz/branches/jquery/framework/example/data/ExampleHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/data/ExampleHelpData.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/data/ExampleHelpData.xml (original) +++ ofbiz/branches/jquery/framework/example/data/ExampleHelpData.xml Tue Dec 7 10:42:16 2010 @@ -1,26 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - -<!-- - The Example help data is located in the applications/content/data/ExampleHelpData.xml file ---> - -</entity-engine-xml> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<entity-engine-xml> + +<!-- + The Example help data is located in the applications/content/data/ExampleHelpData.xml file +--> + +</entity-engine-xml> Modified: ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE.xml (original) +++ ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE.xml Tue Dec 7 10:42:16 2010 @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Example Main Help page.</title> - <para> - The Example application will allow you to discover the possibilities to create an application, with a lot of search boxes, lists and many more. - </para> -</section> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to you under the Apache License, Version +2.0 (the "License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 Unless required by +applicable law or agreed to in writing, software distributed under the +License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for +the specific language governing permissions and limitations under the +License. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Example Main Help page.</title> + <para> + The Example application will allow you to discover the possibilities to create an application, with a lot of search boxes, lists and many more. + </para> +</section> Modified: ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE_main.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE_main.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE_main.xml (original) +++ ofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE_main.xml Tue Dec 7 10:42:16 2010 @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Example Main page.</title> - <para> - In this page, you can create or search an example - </para> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to you under the Apache License, Version +2.0 (the "License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 Unless required by +applicable law or agreed to in writing, software distributed under the +License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for +the specific language governing permissions and limitations under the +License. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Example Main page.</title> + <para> + In this page, you can create or search an example + </para> </section> \ No newline at end of file Modified: ofbiz/branches/jquery/framework/example/widget/example/BirtForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/BirtForms.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/BirtForms.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/BirtForms.xml Tue Dec 7 10:42:16 2010 @@ -1,41 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - - <form name="EditMail" type="single" target="sendBirtMail"> - <field name="sendFrom"><text/></field> - <field name="sendTo"><text/></field> - <field name="subject"><text/></field> - <field name="birtReportLocation" tooltip="Example is component://example/webapp/birt/report/example.rptdesign"><text/></field> - <field name="birtContentType"> - <drop-down> - <option key="text/html" description="text/html"/> - <option key="application/pdf" description="application/pdf"/> - <option key="application/vnd.ms-excel" description="application/vnd.ms-excel"/> - <option key="application/vnd.ms-word" description="application/vnd.ms-word"/> - <option key="application/vnd.ms-powerpoint" description="application/vnd.ms-powerpoint"/> - </drop-down> - </field> - <field name="attachmentName"><text/></field> - <field name="sendButton" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> -</forms> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="EditMail" type="single" target="sendBirtMail"> + <field name="sendFrom"><text/></field> + <field name="sendTo"><text/></field> + <field name="subject"><text/></field> + <field name="birtReportLocation" tooltip="Example is component://example/webapp/birt/report/example.rptdesign"><text/></field> + <field name="birtContentType"> + <drop-down> + <option key="text/html" description="text/html"/> + <option key="application/pdf" description="application/pdf"/> + <option key="application/vnd.ms-excel" description="application/vnd.ms-excel"/> + <option key="application/vnd.ms-word" description="application/vnd.ms-word"/> + <option key="application/vnd.ms-powerpoint" description="application/vnd.ms-powerpoint"/> + </drop-down> + </field> + <field name="attachmentName"><text/></field> + <field name="sendButton" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> +</forms> Modified: ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml Tue Dec 7 10:42:16 2010 @@ -1,113 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - - <screen name="main"> - <section> - <actions> - </actions> - <widgets> - <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <label style="h3" text="BIRT is an open source Eclipse-based reporting system that integrates with any OFBiz application to produce compelling reports including graphical presentations like pie and bar charts."/> - <label style="h3" text="This application provides you with a sample example report."/> - <label style="h3" text="See the help option how to create your own OFBiz intergrated reports."/> - <link style="h3" text="or see the Birt home for more information" target="http://eclipse.org/birt/phoenix/intro/" url-mode="plain" target-window="_blank_"/> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="Report"> - <section> - <actions> - <set field="tabButtonItem" value="Report"/> - </actions> - <widgets> - <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <screenlet title="Using report tag"> - <platform-specific> - <html> - <html-template location="component://example/webapp/birt/birt/report.ftl"/> - </html> - </platform-specific> - </screenlet> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="EditMail"> - <section> - <actions> - <set field="tabButtonItem" value="Mail"/> - </actions> - <widgets> - <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <screenlet title="Send BIRT report by mail"> - <include-form location="component://example/widget/example/BirtForms.xml" name="EditMail"/> - </screenlet> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="chartReport"> - <section> - <actions> - <set field="tabButtonItem" value="chartReport"/> - </actions> - <widgets> - <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <screenlet title="Using report tag"> - <platform-specific> - <html><html-template location="component://example/webapp/birt/birt/chartReport.ftl"/></html> - </platform-specific> - </screenlet> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> -</screens> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="main"> + <section> + <actions> + </actions> + <widgets> + <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <label style="h3" text="BIRT is an open source Eclipse-based reporting system that integrates with any OFBiz application to produce compelling reports including graphical presentations like pie and bar charts."/> + <label style="h3" text="This application provides you with a sample example report."/> + <label style="h3" text="See the help option how to create your own OFBiz intergrated reports."/> + <link style="h3" text="or see the Birt home for more information" target="http://eclipse.org/birt/phoenix/intro/" url-mode="plain" target-window="_blank_"/> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="Report"> + <section> + <actions> + <set field="tabButtonItem" value="Report"/> + </actions> + <widgets> + <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <screenlet title="Using report tag"> + <platform-specific> + <html> + <html-template location="component://example/webapp/birt/birt/report.ftl"/> + </html> + </platform-specific> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="EditMail"> + <section> + <actions> + <set field="tabButtonItem" value="Mail"/> + </actions> + <widgets> + <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <screenlet title="Send BIRT report by mail"> + <include-form location="component://example/widget/example/BirtForms.xml" name="EditMail"/> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="chartReport"> + <section> + <actions> + <set field="tabButtonItem" value="chartReport"/> + </actions> + <widgets> + <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <screenlet title="Using report tag"> + <platform-specific> + <html><html-template location="component://example/webapp/birt/birt/chartReport.ftl"/></html> + </platform-specific> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> Modified: ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css Tue Dec 7 10:42:16 2010 @@ -1126,6 +1126,121 @@ width:10% width:10% } +/* ================================ */ +/* ===== Used to clear floats ===== */ +/* ================================ */ + +.clear { +clear: both; +height: 0; +visibility: hidden; +} + +.no-clear .clear { +/* Used in container elements to override the clear class +in contained elements. */ +clear: none; +} + +/* ================================================= */ +/* ===== Screenlet Title Bar/Navigation Styles ===== */ +/* ================================================= */ + +.screenlet-title-bar { +background-color: #000099; +background-image: url(/images/gradient_sub_uns.gif); +background-repeat: repeat-x; +color: #ffffff; +height: 1%; /* IE fix */ +min-height: 1.5em; +} + +.screenlet-title-bar .h1, +.screenlet-title-bar .h2, +.screenlet-title-bar .h3, +.screenlet-title-bar h1, +.screenlet-title-bar h2, +.screenlet-title-bar h3 { +background: none; +color: #ffffff; +font-weight: bold; +padding: 0.1em 0.5em 0.2em 0.5em; +} + +.screenlet-title-bar ul { +display: inline; /* IE Fix */ +} + +.screenlet-title-bar ul li { +background: none; +color: #ffffff; +float: right; +font-size: 1em; +font-weight: bold; +padding: 0.1em 0.5em 0.2em 0.5em; +} + +.screenlet-title-bar ul h1, +.screenlet-title-bar ul h2, +.screenlet-title-bar ul h3, +.screenlet-title-bar ul .h1, +.screenlet-title-bar ul .h2, +.screenlet-title-bar ul .h3 { +border-left: none; +float: left; +} + +.screenlet-title-bar .h1 { +font-size: 1.6em; +} + +.screenlet-title-bar .h2 { +font-size: 1.3em; +} + +.screenlet-title-bar .h3, +.screenlet-title-bar .head4 { +font-size: 1.2em; +} + +.screenlet-title-bar .h3 a { +color: #ffff66; +display: inline; +} + +.screenlet-title-bar ul a { +color: #ffff66; +display: block; +} + +.screenlet-title-bar ul a:visited { +color: #ffff66; +} + +.screenlet-title-bar ul .disabled { +color: #CCCCCC; +} + +.screenlet-title-bar ul .collapsed, +.screenlet-title-bar ul .collapsed:hover { +background: url(/images/expand.gif) no-repeat center center; +min-height: 1.1em; +min-width: 1.1em; +} + +.screenlet-title-bar ul .expanded, +.screenlet-title-bar ul .expanded:hover { +background: url(/images/collapse.gif) no-repeat center center; +min-height: 1.1em; +min-width: 1.1em; +} + +.screenlet-title-bar ul .collapsed a, +.screenlet-title-bar ul .expanded a { +/* IE fix */ +cursor: default; +} + /* * jQuery UI CSS Framework @VERSION * Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Tue Dec 7 10:42:16 2010 @@ -299,6 +299,7 @@ public class ContextFilter implements Fi // make that tenant active, setup a new delegator and a new dispatcher String tenantDelegatorName = delegator.getDelegatorBaseName() + "#" + tenantId; + httpRequest.getSession().setAttribute("delegatorName", tenantDelegatorName); // after this line the delegator is replaced with the new per-tenant delegator delegator = DelegatorFactory.getDelegator(tenantDelegatorName); @@ -323,8 +324,11 @@ public class ContextFilter implements Fi request.setAttribute("tenantId", tenantId); } - // always put delegator's name to the session - httpRequest.getSession().setAttribute("delegatorName", delegator.getDelegatorName()); + // NOTE DEJ20101130: do NOT always put the delegator name in the user's session because the user may + // have logged in and specified a tenant, and even if no Tenant record with a matching domainName field + // is found this will change the user's delegator back to the base one instead of the one for the + // tenant specified on login + // httpRequest.getSession().setAttribute("delegatorName", delegator.getDelegatorName()); } catch (GenericEntityException e) { Debug.logWarning(e, "Unable to get Tenant", module); } Modified: ofbiz/branches/jquery/framework/webtools/widget/CacheForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/CacheForms.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/widget/CacheForms.xml (original) +++ ofbiz/branches/jquery/framework/webtools/widget/CacheForms.xml Tue Dec 7 10:42:16 2010 @@ -1,85 +1,85 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - - <form name="ListCache" type="list" list-name="cacheList" paginate-target="FindUtilCache" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> - <field name="cacheName" title="${uiLabelMap.WebtoolsCacheName}" sort-field="true"><display/></field> - <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}" sort-field="true"><display/></field> - <field name="hitCount" title="${uiLabelMap.WebtoolsHits}" sort-field="true"><display/></field> - <field name="misses" title="${uiLabelMap.WebtoolsMisses}" sort-field="true"><display description="${missCountTot}/${missCountNotFound}/${missCountExpired}/${missCountSoftRef}"/></field> - <field name="removes" title="${uiLabelMap.WebtoolsRemoves}" sort-field="true"><display description="${removeHitCount}/${removeMissCount}"/></field> - <field name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}" sort-field="true"><display/></field> - <field name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field> - <field name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}" sort-field="true"><display/></field> - <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}" sort-field="true"><display/></field> - <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> - <hyperlink description="${uiLabelMap.WebtoolsElements}" target="FindUtilCacheElements"> - <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> - </hyperlink> - </field> - <field name="admin_edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> - <hyperlink description="${uiLabelMap.CommonEdit}" target="EditUtilCache"> - <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> - </hyperlink> - </field> - <field name="admin_clear" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> - <hyperlink description="${uiLabelMap.CommonClear}" target="FindUtilCacheClear"> - <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> - </hyperlink> - </field> - </form> - - <form name="ListCacheElements" type="list" list-name="cacheElementsList" paginate-target="FindUtilCacheElements" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> - <field name="elementKey" title="${uiLabelMap.WebtoolsCacheElementKey}" sort-field="true"><display/></field> - <field name="expireTimeMillis" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field> - <field name="lineSize" title="${uiLabelMap.WebtoolsBytes}" sort-field="true"><display/></field> - - <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> - <hyperlink description="${uiLabelMap.CommonRemove}" target="FindUtilCacheElementsRemoveElement"> - <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> - <parameter param-name="UTIL_CACHE_ELEMENT_NUMBER" from-field="keyNum"/> - </hyperlink> - </field> - </form> - - <form name="EditCache" type="single" target="EditUtilCacheUpdate" default-map-name="cache"> - <field name="UTIL_CACHE_NAME" entry-name="cacheName" title="${uiLabelMap.WebtoolsCacheName}"><display/></field> - <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}"><display/></field> - <field name="hitCount" title="${uiLabelMap.WebtoolsHits}"><display/></field> - <field name="missCountTot" title="${uiLabelMap.WebtoolsMissesTotal}"><display/></field> - <field name="missCountNotFound" title="${uiLabelMap.WebtoolsMissesNotFound}"><display/></field> - <field name="missCountExpired" title="${uiLabelMap.WebtoolsMissesExpire}"><display/></field> - <field name="missCountSoftRef" title="${uiLabelMap.WebtoolsMissesSoftReference}"><display/></field> - <field name="removeHitCount" title="${uiLabelMap.WebtoolsRemovesHit}"><display/></field> - <field name="removeMissCount" title="${uiLabelMap.WebtoolsRemovesMisses}"><display/></field> - <field name="UTIL_CACHE_MAX_IN_MEMORY" entry-name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}"><text/></field> - <field name="UTIL_CACHE_EXPIRE_TIME" entry-name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}"><text/></field> - <field name="UTIL_CACHE_USE_SOFT_REFERENCE" entry-name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}"> - <drop-down allow-empty="false"> - <option key="false" description="${uiLabelMap.CommonFalse}"/> - <option key="true" description="${uiLabelMap.CommonTrue}"/> - </drop-down> - </field> - <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}"><display/></field> - <field name="submitButton" title="${uiLabelMap.CommonApply}"><submit button-type="button"/></field> - </form> -</forms> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="ListCache" type="list" list-name="cacheList" paginate-target="FindUtilCache" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> + <field name="cacheName" title="${uiLabelMap.WebtoolsCacheName}" sort-field="true"><display/></field> + <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}" sort-field="true"><display/></field> + <field name="hitCount" title="${uiLabelMap.WebtoolsHits}" sort-field="true"><display/></field> + <field name="misses" title="${uiLabelMap.WebtoolsMisses}" sort-field="true"><display description="${missCountTot}/${missCountNotFound}/${missCountExpired}/${missCountSoftRef}"/></field> + <field name="removes" title="${uiLabelMap.WebtoolsRemoves}" sort-field="true"><display description="${removeHitCount}/${removeMissCount}"/></field> + <field name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}" sort-field="true"><display/></field> + <field name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field> + <field name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}" sort-field="true"><display/></field> + <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}" sort-field="true"><display/></field> + <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> + <hyperlink description="${uiLabelMap.WebtoolsElements}" target="FindUtilCacheElements"> + <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> + </hyperlink> + </field> + <field name="admin_edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="EditUtilCache"> + <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> + </hyperlink> + </field> + <field name="admin_clear" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> + <hyperlink description="${uiLabelMap.CommonClear}" target="FindUtilCacheClear"> + <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> + </hyperlink> + </field> + </form> + + <form name="ListCacheElements" type="list" list-name="cacheElementsList" paginate-target="FindUtilCacheElements" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> + <field name="elementKey" title="${uiLabelMap.WebtoolsCacheElementKey}" sort-field="true"><display/></field> + <field name="expireTimeMillis" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field> + <field name="lineSize" title="${uiLabelMap.WebtoolsBytes}" sort-field="true"><display/></field> + + <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="FindUtilCacheElementsRemoveElement"> + <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/> + <parameter param-name="UTIL_CACHE_ELEMENT_NUMBER" from-field="keyNum"/> + </hyperlink> + </field> + </form> + + <form name="EditCache" type="single" target="EditUtilCacheUpdate" default-map-name="cache"> + <field name="UTIL_CACHE_NAME" entry-name="cacheName" title="${uiLabelMap.WebtoolsCacheName}"><display/></field> + <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}"><display/></field> + <field name="hitCount" title="${uiLabelMap.WebtoolsHits}"><display/></field> + <field name="missCountTot" title="${uiLabelMap.WebtoolsMissesTotal}"><display/></field> + <field name="missCountNotFound" title="${uiLabelMap.WebtoolsMissesNotFound}"><display/></field> + <field name="missCountExpired" title="${uiLabelMap.WebtoolsMissesExpire}"><display/></field> + <field name="missCountSoftRef" title="${uiLabelMap.WebtoolsMissesSoftReference}"><display/></field> + <field name="removeHitCount" title="${uiLabelMap.WebtoolsRemovesHit}"><display/></field> + <field name="removeMissCount" title="${uiLabelMap.WebtoolsRemovesMisses}"><display/></field> + <field name="UTIL_CACHE_MAX_IN_MEMORY" entry-name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}"><text/></field> + <field name="UTIL_CACHE_EXPIRE_TIME" entry-name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}"><text/></field> + <field name="UTIL_CACHE_USE_SOFT_REFERENCE" entry-name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}"> + <drop-down allow-empty="false"> + <option key="false" description="${uiLabelMap.CommonFalse}"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + </drop-down> + </field> + <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonApply}"><submit button-type="button"/></field> + </form> +</forms> Modified: ofbiz/branches/jquery/framework/webtools/widget/LabelManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/LabelManagerScreens.xml?rev=1042964&r1=1042963&r2=1042964&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/widget/LabelManagerScreens.xml (original) +++ ofbiz/branches/jquery/framework/webtools/widget/LabelManagerScreens.xml Tue Dec 7 10:42:16 2010 @@ -1,129 +1,129 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - - <screen name="SearchLabels"> - <section> - <condition> - <if-has-permission permission="LABEL_MANAGER_VIEW"/> - </condition> - <actions> - <set field="titleProperty" value="WebtoolsLabelManagerFindLabels"/> - <set field="tabButtonItem" value="labels"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy"/> - </actions> - <widgets> - <decorator-screen name="CommonArtifactDecorator" location="component://webtools/widget/CommonScreens.xml"> - <decorator-section name="body"> - <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="search-options"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/SearchLabels.ftl"/></html></platform-specific> - </decorator-section> - <decorator-section name="search-results"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewLabels.ftl"/></html></platform-specific> - </decorator-section> - </decorator-screen> - <!-- - <screenlet id="ViewHardcodedLabelsPanel" title="${uiLabelMap.WebtoolsLabelManagerHardcoded}" collapsible="false"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl"/></html></platform-specific> - </screenlet> - --> - </decorator-section> - </decorator-screen> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> - </fail-widgets> - </section> - </screen> - - <screen name="UpdateLabel"> - <section> - <condition> - <if-has-permission permission="LABEL_MANAGER_VIEW"/> - </condition> - <actions> - <set field="titleProperty" value="WebtoolsLabelManagerAddNew"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="h1"> - <label text="${uiLabelMap.WebtoolsLabelManagerAddNew}"/> - </container> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/UpdateLabel.ftl"/></html></platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> - </fail-widgets> - </section> - </screen> - - <screen name="ViewReferences"> - <section> - <condition> - <if-has-permission permission="LABEL_MANAGER_VIEW"/> - </condition> - <actions> - <set field="titleProperty" value="WebtoolsLabelManagerViewReferences"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewReferences.ftl"/></html></platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> - </fail-widgets> - </section> - </screen> - - <screen name="ViewFile"> - <section> - <condition> - <if-has-permission permission="LABEL_MANAGER_VIEW"/> - </condition> - <actions> - <set field="titleProperty" value="WebtoolsLabelManagerViewFile"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewFile.groovy"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet id="ViewFilePanel" title="${uiLabelMap.WebtoolsLabelManagerViewFile}"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewFile.ftl"/></html></platform-specific> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> - </fail-widgets> - </section> - </screen> -</screens> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="SearchLabels"> + <section> + <condition> + <if-has-permission permission="LABEL_MANAGER_VIEW"/> + </condition> + <actions> + <set field="titleProperty" value="WebtoolsLabelManagerFindLabels"/> + <set field="tabButtonItem" value="labels"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy"/> + </actions> + <widgets> + <decorator-screen name="CommonArtifactDecorator" location="component://webtools/widget/CommonScreens.xml"> + <decorator-section name="body"> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/SearchLabels.ftl"/></html></platform-specific> + </decorator-section> + <decorator-section name="search-results"> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewLabels.ftl"/></html></platform-specific> + </decorator-section> + </decorator-screen> + <!-- + <screenlet id="ViewHardcodedLabelsPanel" title="${uiLabelMap.WebtoolsLabelManagerHardcoded}" collapsible="false"> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl"/></html></platform-specific> + </screenlet> + --> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> + </fail-widgets> + </section> + </screen> + + <screen name="UpdateLabel"> + <section> + <condition> + <if-has-permission permission="LABEL_MANAGER_VIEW"/> + </condition> + <actions> + <set field="titleProperty" value="WebtoolsLabelManagerAddNew"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="h1"> + <label text="${uiLabelMap.WebtoolsLabelManagerAddNew}"/> + </container> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/UpdateLabel.ftl"/></html></platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> + </fail-widgets> + </section> + </screen> + + <screen name="ViewReferences"> + <section> + <condition> + <if-has-permission permission="LABEL_MANAGER_VIEW"/> + </condition> + <actions> + <set field="titleProperty" value="WebtoolsLabelManagerViewReferences"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewReferences.ftl"/></html></platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> + </fail-widgets> + </section> + </screen> + + <screen name="ViewFile"> + <section> + <condition> + <if-has-permission permission="LABEL_MANAGER_VIEW"/> + </condition> + <actions> + <set field="titleProperty" value="WebtoolsLabelManagerViewFile"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewFile.groovy"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet id="ViewFilePanel" title="${uiLabelMap.WebtoolsLabelManagerViewFile}"> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewFile.ftl"/></html></platform-specific> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label> + </fail-widgets> + </section> + </screen> +</screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |