Author: hansbak
Date: Thu Oct 24 06:42:34 2013
New Revision: 1535287
URL: http://svn.apache.org/r1535287
Log:
revert of unwanted commit, sorry!
Modified:
ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
ofbiz/trunk/applications/content/servicedef/secas.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
ofbiz/trunk/specialpurpose/build.xml
ofbiz/trunk/specialpurpose/component-load.xml
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
ofbiz/trunk/themes/tomahawk/includes/header.ftl
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
(original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml Thu
Oct 24 06:42:34 2013
@@ -47,7 +47,7 @@
<actions>
<!-- fields for
setDependentDropdownValuesJs.ftl, it's a try on generalization, if you need an
example with more than one dropdown in a form have a look at
EditProductPriceRules screen -->
<set field="dependentForm"
value="NewOrganization"/>
- <set field="paramKey" value="countryGeoId"/>
+ <set field="paramKey" value="countryGeoId"/>
<set field="mainId" value="USER_COUNTRY"/>
<set field="dependentId" value="USER_STATE"/>
<set field="requestName"
value="getAssociatedStateList"/>
Modified: ofbiz/trunk/applications/content/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/secas.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/secas.xml Thu Oct 24 06:42:34
2013
@@ -127,7 +127,7 @@ under the License.
<condition field-name="partyId" operator="is-empty"/>
<condition field-name="roleTypeId" operator="is-empty"/>
<condition field-name="userLogin" operator="is-not-empty"/>
- <set field-name="partyId" env-name="${userLogin.partyId}"
value="_NA_"/>
+ <set field-name="partyId" env-name="${userLogin.partyId}"/>
<set field-name="roleTypeId" value="OWNER"/>
<action service="createContentRole" mode="sync" run-as-user="system"/>
</eca>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
Thu Oct 24 06:42:34 2013
@@ -803,7 +803,6 @@ under the License.
<entity-condition list="prodCatalogCategoryList"
entity-name="ProdCatalogCategory" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId"
from-field="parameters.productCategoryId"/>
- <condition-expr field-name="prodCatalogId"
from-field="parameters.prodCatalogId"/>
<condition-list combine="or">
<condition-expr field-name="prodCatalogCategoryTypeId"
value="PCCT_VIEW_ALLW"/>
<condition-expr field-name="prodCatalogCategoryTypeId"
value="PCCT_PURCH_ALLW"/>
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
Thu Oct 24 06:42:34 2013
@@ -405,16 +405,15 @@ public class CategoryServices {
public static void getChildCategoryTree(HttpServletRequest request,
HttpServletResponse response){
Delegator delegator = (Delegator) request.getAttribute("delegator");
String productCategoryId = request.getParameter("productCategoryId");
- String currentCategoryId = request.getParameter("currentCategoryId");
String isCatalog = request.getParameter("isCatalog");
String isCategoryType = request.getParameter("isCategoryType");
String onclickFunction = request.getParameter("onclickFunction");
String additionParam = request.getParameter("additionParam");
String hrefString = request.getParameter("hrefString");
String hrefString2 = request.getParameter("hrefString2");
- String showCategoryId = (request.getParameter("showCategoryId") !=
null ? request.getParameter("showCategoryId") : "true");
String entityName = null;
String primaryKeyName = null;
+
if (isCatalog.equals("true")) {
entityName = "ProdCatalog";
primaryKeyName = "prodCatalogId";
@@ -463,18 +462,6 @@ public class CategoryServices {
// If chosen category's child exists, then put the
arrow before category icon
if (UtilValidate.isNotEmpty(childList)) {
josonMap.put("state", "closed");
- // Set open state to a parent category of current
category
- if (UtilValidate.isNotEmpty(currentCategoryId)) {
- List<GenericValue> allChildCategoryList =
CategoryWorker.getRelatedCategoriesRet(delegator, "allChildCategoryList",
(String)catId, true, false, true);
-
if(UtilValidate.isNotEmpty(allChildCategoryList)){
- for (GenericValue allChildCategory:
allChildCategoryList) {
- if
((allChildCategory.get("productCategoryId")).equals(currentCategoryId)) {
- josonMap.put("state", "open");
- }
- }
-
- }
- }
}
Map dataMap = FastMap.newInstance();
Map dataAttrMap = FastMap.newInstance();
@@ -482,11 +469,7 @@ public class CategoryServices {
String title = null;
if
(UtilValidate.isNotEmpty(categoryContentWrapper.get(catNameField))) {
- if (showCategoryId.equals("true")) {
- title =
categoryContentWrapper.get(catNameField)+" "+"["+catId+"]";
- }else{
- title =
categoryContentWrapper.get(catNameField)+" ";
- }
+ title = categoryContentWrapper.get(catNameField)+"
"+"["+catId+"]";
dataMap.put("title", title);
} else {
title = catId.toString();
@@ -506,10 +489,6 @@ public class CategoryServices {
attrMap.put("id", catId);
attrMap.put("isCatalog", false);
attrMap.put("rel", "CATEGORY");
- attrMap.put("name", title);
- if (UtilValidate.isNotEmpty(currentCategoryId)) {
- attrMap.put("currentCategoryId",
currentCategoryId);
- }
josonMap.put("attr",attrMap);
josonMap.put("sequenceNum",childOfCat.get("sequenceNum"));
josonMap.put("title",title);
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Oct 24 06:42:34
2013
@@ -182,9 +182,9 @@ under the License.
<set field="iconsLocation"
from-field="layoutSettings.VT_ICONS_LOC[0]"
default-value="/images/icons/famfamfam" global="true" />
<set field="headerTemplateLocation"
from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" />
<set field="footerTemplateLocation"
from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" />
- <set field="appbarTemplateLocation"
from-field="newAppbarTemplateLocation"
default-value="${layoutSettings.VT_NAV_TMPLT_LOC[0]}" global="true" />
- <set field="appbarOpenTemplateLocation"
from-field="newAppbarTemplateLocationOpen"
default-value="${layoutSettings.VT_NAV_OPEN_TMPLT[0]}" />
- <set field="appbarCloseTemplateLocation"
from-field="newAppbarTemplateLocationClose"
default-value="${layoutSettings.VT_NAV_CLOSE_TMPLT[0]}" />
+ <set field="appbarTemplateLocation"
from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]" />
+ <set field="appbarOpenTemplateLocation"
from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]" />
+ <set field="appbarCloseTemplateLocation"
from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]" />
<set field="messagesTemplateLocation"
from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" />
<set field="layoutSettings.suppressTab"
value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
</actions>
Modified:
ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
Thu Oct 24 06:42:34 2013
@@ -121,7 +121,7 @@ public final class SecurityFactory {
@Override
public boolean hasEntityPermission(String entity, String action,
GenericValue userLogin) {
if (userLogin == null) return false;
- String permission = entity.concat(action==null ? null : action);
+ String permission = entity.concat(action);
String adminPermission = entity.concat("_ADMIN");
Iterator<GenericValue> iterator =
findUserLoginSecurityGroupByUserLoginId(userLogin.getString("userLoginId"));
while (iterator.hasNext()) {
Modified: ofbiz/trunk/specialpurpose/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Thu Oct 24 06:42:34 2013
@@ -33,6 +33,7 @@
ebay/build.xml,
ebaystore/build.xml,
projectmgr/build.xml,
+ scrum/build.xml,
ldap/build.xml,
webpos/build.xml
googlecheckout/build.xml,
Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Thu Oct 24 06:42:34 2013
@@ -28,6 +28,7 @@ under the License.
<load-component component-location="assetmaint"/>
<load-component component-location="cmssite"/>
<load-component component-location="projectmgr"/>
+ <load-component component-location="scrum"/>
<load-component component-location="oagis"/>
<load-component component-location="googlebase"/>
<load-component component-location="googlecheckout"/>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Thu Oct 24 06:42:34 2013
@@ -118,7 +118,7 @@ under the License.
<div id="wait-spinner" style="display:none">
<div id="wait-spinner-image"></div>
</div>
- <div id="header" style="margin-top: -22px;">
+ <div id="header">
<#if organizationLogoLinkURL?has_content>
<div id="org-logo-area"><a
href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img
alt="${layoutSettings.companyName}"
src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"
height="43px"></a></div>
<#else>
Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Thu Oct
24 06:42:34 2013
@@ -158,15 +158,6 @@ Generic Classes
img.left {display: inline; float: left; margin: 0 1.5em .75em 0;}
img.right {display: inline; float: right; margin: 0 0 .75em .75em;}
-.lefthalf{
- float: left;
- width: 610px;
-}
-.righthalf{
- float: right;
- width: 500px;
-}
-/*
.lefthalf {
float: left;
height: 1%;
@@ -182,7 +173,7 @@ img.right {display: inline; float: right
right: 0;
width: 49%;
}
-*/
+
.leftclear {
clear: left;
height: 1%;
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Thu Oct 24 06:42:34
2013
@@ -105,7 +105,7 @@ input[type="radio"],input[type="checkbox
margin: 0.2em;
}
-input[type="text"],input[type="password"],input[type="number"] {
+input[type="text"],input[type="password"] {
background-color: #ffffff;
border: #999999 solid 0.1em;
font-size: 1.1em;
Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
(original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Thu
Oct 24 06:42:34 2013
@@ -100,7 +100,7 @@ font-size: 1.1em;
margin: 0.2em;
}
-input[type="text"],input[type="password"],input[type="number"] {
+input[type="text"],input[type="password"] {
background-color: #ffffff;
border: #999999 solid 0.1em;
font-size: 1.1em;
@@ -934,8 +934,8 @@ font-weight: bold;
/* ===== Masthead (Header) Styles ===== */
/* ==================================== */
#logo-area {
-/* background: url(/droppingcrumbs/images/ofbiz_logo.gif) no-repeat;
-width:260px; */
+background: url(/droppingcrumbs/images/ofbiz_logo.gif) no-repeat;
+width:260px;
height:50px;
}
Modified: ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml (original)
+++ ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml Thu Oct 24 06:42:34
2013
@@ -26,7 +26,7 @@ under the License.
<VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_DOCBOOKSTYLESHEET"
resourceValue="/tomahawk/webapp/tomahawk/css/docbook.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/tomahawk/js/dropdown.js"
sequenceId="01"/>
<VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico"
sequenceId="01"/>
- <VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_HDR_IMAGE_URL"
resourceValue="/tomahawk/images/ofbiz_logo.gif" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif"
sequenceId="01"/>
<VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_HDR_TMPLT_LOC"
resourceValue="component://tomahawk/includes/header.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_FTR_TMPLT_LOC"
resourceValue="component://tomahawk/includes/footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="TOMAHAWK"
resourceTypeEnumId="VT_NAV_OPEN_TMPLT"
resourceValue="component://tomahawk/includes/appbarOpen.ftl" sequenceId="01"/>
Modified: ofbiz/trunk/themes/tomahawk/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Thu Oct 24 06:42:34 2013
@@ -119,7 +119,7 @@ under the License.
<#if organizationLogoLinkURL?has_content>
<li id="org-logo-area"><a
href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img
alt="${layoutSettings.companyName}"
src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li>
<#else>
- <li id="logo-area"><a
href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"
title="${layoutSettings.companyName}"><img alt="${layoutSettings.companyName}"
src="<@ofbizContentUrl>${StringUtil.wrapString(headerImageUrl)}</@ofbizContentUrl>"/></a></li>
+ <li id="logo-area"><a
href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"
title="${layoutSettings.companyName}"></a></li>
</#if>
</#if>
<#if layoutSettings.middleTopMessage1?has_content &&
layoutSettings.middleTopMessage1 != " ">
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1535287&r1=1535286&r2=1535287&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Thu Oct 24
06:42:34 2013
@@ -102,7 +102,7 @@ margin: 0.2em;
vertical-align:middle;
}
-input[type="text"],input[type="password"],input[type="number"]{
+input[type="text"],input[type="password"] {
background-color: #fffcea;
border:0.1em solid #999999;
font-size: 1.1em;
@@ -945,13 +945,12 @@ text-align: center;
/* ==================================== */
/* ===== Masthead (Header) Styles ===== */
/* ==================================== */
-/******* Hidden the default OFBIz logo
#logo-area {
background: url(../images/ofbiz_logo.png) no-repeat;
width:385px;
height:50px;
}
-*/
+
#logo-area a{
display:block;
height:100%;
