svn commit: r1199251 [1/11] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1199251 [1/11] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Tue Nov 8 14:08:24 2011 New Revision: 1199251 URL: http://svn.apache.org/viewvc?rev=1199251&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Added: ofbiz/branches/jackrabbit20100709/applications/content/config/contentsearch.properties - copied unchanged from r1199246, ofbiz/trunk/applications/content/config/contentsearch.properties ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.7.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.7.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt-BR.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt-BR.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.mockjax.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.mockjax.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_eu.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_eu.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_sl.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_sl.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/css/ui-lightness/jquery-ui-1.8.16.custom.css - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/ui/css/ui-lightness/jquery-ui-1.8.16.custom.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery-ui-1.8.16.custom.css - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery-ui-1.8.16.custom.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.16.custom.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.16.custom.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js - copied unchanged from r1199246, ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js Removed: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.13.custom.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/product/config/prodsearch.properties ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/KeywordIndex.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/Makefile ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/additional-methods.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/changelog.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_fi.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_no.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptbr.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ru.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_se.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/version.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/external/qunit.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/external/qunit.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.resizable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.selectable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.slider.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.tabs.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.theme.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/images/ui-icons_ffd27a_256x240.png ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.accordion.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.all.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.button.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.core.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.datepicker.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.dialog.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.progressbar.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.resizable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.selectable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.slider.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.tabs.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.theme.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery-ui-i18n.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-nl.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.blind.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.bounce.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.clip.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.core.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.drop.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.explode.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.fade.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.fold.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.highlight.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.pulsate.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.scale.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.shake.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.slide.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.transfer.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.accordion.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.autocomplete.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.button.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.core.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.dialog.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.draggable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.droppable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.mouse.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.position.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.progressbar.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.resizable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.selectable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.slider.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.sortable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.tabs.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.widget.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.blind.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.bounce.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.clip.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.core.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.drop.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.explode.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.fade.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.fold.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.highlight.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.pulsate.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.scale.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.shake.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.slide.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.transfer.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.accordion.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.autocomplete.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.button.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.core.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.datepicker.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.dialog.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.draggable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.droppable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.mouse.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.position.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.progressbar.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.resizable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.selectable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.slider.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.sortable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.tabs.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.widget.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/version.txt ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/images/ui-icons_454545_256x240.png ofbiz/branches/jackrabbit20100709/themes/bluelight/webapp/bluelight/images/ui-icons_454545_256x240.png ofbiz/branches/jackrabbit20100709/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/images/ui-icons_454545_256x240.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/images/ui-bg_inset-hard_100_f5f8f9_1x100.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/images/ui-icons_469bdd_256x240.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/images/ui-icons_6da8d5_256x240.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/javascript.css ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/images/ui-icons_ffd27a_256x240.png Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 8 14:08:24 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1197242 +/ofbiz/trunk:962442-1199246 Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Nov 8 14:08:24 2011 @@ -194,7 +194,7 @@ under the License. <set field="actual" value="true" type="Boolean"/> <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedPayment"> <field field="payment" type="GenericValue"/> - <field field="actual"/> + <field field="actual" type="Boolean"/> </call-class-method> </if-compare-field> </then> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml Tue Nov 8 14:08:24 2011 @@ -290,7 +290,7 @@ under the License. </field> <field name="invoiceItemSeqId"><display/></field> <field name="amountApplied"><display/></field> - <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}"><submit/></field> + <field name="removeButton"><submit/></field> </form> <form name="editPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="removePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -298,7 +298,7 @@ under the License. <field name="paymentId"><hidden/></field> <field name="toPaymentId"><display/></field> <field name="amountApplied"><display/></field> - <field name="removeButton" title="${uiLabelMap.CommonRemove}"><submit/></field> + <field name="removeButton"><submit/></field> </form> <form name="editPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="removePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Nov 8 14:08:24 2011 @@ -1430,7 +1430,7 @@ </iterate> <iterate entry="productCategoryList" list="parameters.productCategories"> - <!-- Create Content Alternative URLs for Product Category --> + <!-- Create Content Alternative URLs for Product Category Content --> <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/> @@ -1459,7 +1459,7 @@ </if-compare> </iterate> - <!-- Create Content Alternative URLs for Product --> + <!-- Create Content Alternative URLs for Product Content --> <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/> @@ -1497,6 +1497,45 @@ </iterate> </iterate> </iterate> + + <!-- Create Content Alternative URLs for Website Content (webSiteContentTypeId=BLOG_ROOT) --> + <entity-and list="webSiteContents" entity-name="WebSiteContent" filter-by-date="true"> + <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> + <field-map field-name="webSiteContentTypeId" value="BLOG_ROOT"/> + </entity-and> + <first-from-list entry="webSiteContent" list="webSiteContents"/> + <if-not-empty field="webSiteContent"> + <entity-and list="blogContents" entity-name="ContentAssoc" filter-by-date="true"> + <field-map field-name="contentId" from-field="webSiteContent.contentId"/> + <field-map field-name="contentAssocTypeId" value="SUB_CONTENT"/> + </entity-and> + <iterate entry="blogContent" list="blogContents"> + <entity-and list="contentAssocs" entity-name="ContentAssoc" filter-by-date="true"> + <field-map field-name="contentId" from-field="blogContent.contentIdTo"/> + <field-map field-name="contentAssocTypeId" value="PUBLISH_LINK"/> + </entity-and> + <iterate entry="contentAssoc" list="contentAssocs"> + <set field="createMissingContentAltUrlsMap.contentId" from-field="contentAssoc.contentIdTo"/> + <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingContentAltUrlsMap"> + <result-to-field result-name="contentCreated" field="contentCreated"/> + </call-service> + <if-compare operator="equals" value="Y" field="contentCreated"> + <calculate field="contentsUpdated" type="Integer"> + <calcop operator="add" field="contentsUpdated"> + <number value="1"/> + </calcop> + </calculate> + </if-compare> + <if-compare operator="equals" value="N" field="contentCreated"> + <calculate field="contentsNotUpdated" type="Integer"> + <calcop operator="add" field="contentsNotUpdated"> + <number value="1"/> + </calcop> + </calculate> + </if-compare> + </iterate> + </iterate> + </if-not-empty> <field-to-result field="contentsNotUpdated" result-name="contentsNotUpdated"/> <field-to-result field="contentsUpdated" result-name="contentsUpdated"/> </simple-method> Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Nov 8 14:08:24 2011 @@ -248,6 +248,7 @@ under the License. </calculate> </if-compare> <if-compare operator="equals" value="content" field="typeGenerate"> + <set field="createMissingContentAltUrlsMap.webSiteId" from-field="parameters.webSiteId"/> <set field="createMissingContentAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/> <call-service service-name="createMissingContentAltUrls" in-map-name="createMissingContentAltUrlsMap"> <result-to-field result-name="contentsNotUpdated" field="contentsNotUpdated"/> @@ -305,6 +306,7 @@ under the License. </calculate> </if-compare> <if-compare operator="equals" value="content" field="typeGenerate"> + <set field="createMissingContentAltUrlsMap.webSiteId" from-field="parameters.webSiteId"/> <set field="createMissingContentAltUrlsMap.prodCatalogId" from-field="parameters.prodCatalogId"/> <call-service service-name="createMissingContentAltUrls" in-map-name="createMissingContentAltUrlsMap"> <result-to-field result-name="contentsNotUpdated" field="contentsNotUpdated"/> Modified: ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml Tue Nov 8 14:08:24 2011 @@ -48,6 +48,8 @@ <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/> <override name="contentTypeId" default-value="DOCUMENT"/> + <override name="contentName" allow-html="safe"/> + <override name="description" allow-html="safe"/> </service> <service name="createTextAndUploadedContent" engine="simple" auth="true" @@ -129,6 +131,8 @@ <attribute mode="IN" name="displayFailCond" optional="true" type="Boolean"/> <attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/> <!-- end of depricated fields --> + <override name="contentName" allow-html="safe"/> + <override name="description" allow-html="safe"/> </service> <service name="updateTextContent" engine="group" auth="true"> @@ -341,6 +345,7 @@ location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createMissingContentAltUrls" auth="true" use-transaction="false"> <description>Create missing Content Alternative URLs</description> <attribute name="prodCatalogId" mode="IN" type="String" optional="false"/> + <attribute name="webSiteId" mode="IN" type="String" optional="true"/> <attribute name="contentsNotUpdated" mode="OUT" type="Integer" optional="true"/> <attribute name="contentsUpdated" mode="OUT" type="Integer" optional="true"/> </service> Modified: ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml Tue Nov 8 14:08:24 2011 @@ -38,6 +38,7 @@ <attribute name="dataResource" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/> <attribute name="uploadedFile" type="java.nio.ByteBuffer" mode="IN" optional="true"/> <override name="objectInfo" allow-html="safe"/> + <override name="dataResourceName" allow-html="safe"/> </service> <service name="createDataResourceAndAssocToContent" default-entity-name="DataResource" engine="simple" location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceAndAssocToContent" auth="true"> @@ -59,6 +60,7 @@ <attribute name="dataResourceId" type="String" mode="OUT" optional="false"/> <attribute name="dataResource" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/> <override name="objectInfo" allow-html="safe"/> + <override name="dataResourceName" allow-html="safe"/> </service> <service name="removeDataResource" engine="simple" default-entity-name="DataResource" auth="true" location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="deleteDataResource"> Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java Tue Nov 8 14:08:24 2011 @@ -198,9 +198,12 @@ public class ContentKeywordIndex { } List<GenericValue> toBeStored = FastList.newInstance(); + int keywordMaxLength = Integer.parseInt(UtilProperties.getPropertyValue("contentsearch", "content.keyword.max.length")); for (Map.Entry<String, Long> entry: keywords.entrySet()) { - GenericValue contentKeyword = delegator.makeValue("ContentKeyword", UtilMisc.toMap("contentId", content.getString("contentId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); - toBeStored.add(contentKeyword); + if (entry.getKey().length() <= keywordMaxLength) { + GenericValue contentKeyword = delegator.makeValue("ContentKeyword", UtilMisc.toMap("contentId", content.getString("contentId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); + toBeStored.add(contentKeyword); + } } if (toBeStored.size() > 0) { if (Debug.verboseOn()) Debug.logVerbose("[ContentKeywordIndex.indexKeywords] Storing " + toBeStored.size() + " keywords for contentId " + content.getString("contentId"), module); Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml Tue Nov 8 14:08:24 2011 @@ -86,7 +86,7 @@ under the License. <screen name="navigateContent"> <section> <actions> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/> <set field="titleProperty" value="PageTitleNavigateContent"/> <set field="tabButtonItem" value="navigateContent"/> <set field="labelTitleProperty" value="PageTitleNavigateContent"/> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Tue Nov 8 14:08:24 2011 @@ -98,11 +98,8 @@ if (productionRunId) { Map routingTaskData = routingTask.getAllFields(); routingTaskData.estimatedSetupMillis = routingTask.getDouble("estimatedSetupMillis"); routingTaskData.estimatedMilliSeconds = routingTask.getDouble("estimatedMilliSeconds"); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); - editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); - editPrRoutingTaskWrapper.putInContext("actionForm", "UpdateRoutingTask"); + context.routingTaskData = routingTaskData; routingTaskData.partyId = userLogin.partyId; - context.editPrRoutingTaskWrapper = editPrRoutingTaskWrapper; context.routingTaskId = routingTaskId; // Get the list of deliverable products, i.e. the WorkEffortGoodStandard entries // with workEffortGoodStdTypeId = "PRUNT_PROD_DELIV": @@ -116,16 +113,10 @@ if (productionRunId) { if (templateTask) { delivProducts = EntityUtil.filterByDate(templateTask.getRelatedByAnd("WorkEffortGoodStandard", [workEffortGoodStdTypeId : "PRUNT_PROD_DELIV"])); } - HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); - createRoutingTaskDelivProductForm.putInContext("formData", [productionRunId : productionRunId, workEffortId : routingTaskId]); - context.createRoutingTaskDelivProductForm = createRoutingTaskDelivProductForm; context.delivProducts = delivProducts; // Get the list of delivered products, i.e. inventory items prunInventoryProduced = delegator.findByAnd("WorkEffortAndInventoryProduced", [workEffortId : routingTaskId]); context.prunInventoryProduced = prunInventoryProduced; - HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); - prunInventoryProducedForm.putInContext("prunInventoryProduced", prunInventoryProduced); - context.prunInventoryProducedForm = prunInventoryProducedForm; } // RoutingTasks list Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Tue Nov 8 14:08:24 2011 @@ -1,35 +0,0 @@ -<#-- -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. ---> - - <#if routingTaskId?has_content || actionForm=="AddRoutingTask"> - <table class="basic-table" cellspacing="0"> - <tr> - <td> - ${editPrRoutingTaskWrapper.renderFormString(context)} - </td> - <td> - ${createRoutingTaskDelivProductForm.renderFormString(context)} - <#if prunInventoryProduced?has_content> - ${prunInventoryProducedForm.renderFormString(context)} - </#if> - </td> - </tr> - </table> - </#if> - <br /> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Tue Nov 8 14:08:24 2011 @@ -240,9 +240,25 @@ under the License. <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl"/></html> - </platform-specific> + <section> + <condition> + <not><if-empty field="parameters.routingTaskId"/></not> + </condition> + <widgets> + <container style="lefthalf"> + <include-form name="EditProductionRunDeclRoutingTask" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + </container> + <container style="righthalf"> + <include-form name="CreateRoutingTaskDelivProduct" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + <section> + <condition><not><if-empty field="prunInventoryProduced"/></not></condition> + <widgets> + <include-form name="ProductionRunTaskInventoryProducedList" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + </widgets> + </section> + </container> + </widgets> + </section> </screenlet> <screenlet title="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}"> <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Tue Nov 8 14:08:24 2011 @@ -536,7 +536,7 @@ under the License. <form name="CreateRoutingTaskDelivProduct" type="single" target="createProductionRunTaskProduct" title="" default-map-name="formData" header-row-style="header-row" default-table-style="basic-table"> <field name="productionRunId"><hidden/></field> - <field name="workEffortId"><hidden/></field> + <field name="workEffortId"><hidden value="${routingTaskId}"/></field> <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="${groovy:delivProducts.size()>0}"> <drop-down allow-empty="false"> <list-options list-name="delivProducts" key-name="productId" description="${productId}"/> Modified: ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml Tue Nov 8 14:08:24 2011 @@ -120,6 +120,7 @@ under the License. <attribute name="externalId" type="String" mode="IN" optional="true"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> <override name="groupName" optional="false"/> + <override name="comments" allow-html="safe"/> </service> <service name="updatePartyGroup" engine="java" default-entity-name="PartyGroup" location="org.ofbiz.party.party.PartyServices" invoke="updatePartyGroup" auth="true"> @@ -132,6 +133,7 @@ under the License. <attribute name="preferredCurrencyUomId" type="String" mode="IN" optional="true"/> <attribute name="externalId" type="String" mode="IN" optional="true"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> + <override name="comments" allow-html="safe"/> </service> <service name="savePartyNameChange" engine="simple" Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/prodsearch.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/prodsearch.properties?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/prodsearch.properties (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/prodsearch.properties Tue Nov 8 14:08:24 2011 @@ -57,3 +57,6 @@ index.delete.on_index=false attach.feature.type.exclude=BILLING_FEATURE,GIFT_WRAP # if this (the include property) is empty all types will be included, if it contains anything only those types will be included attach.feature.type.include= + +# The product keyword will not create when word's length more than keyword.max.length +product.keyword.max.length = 15 Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/KeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/KeywordIndex.java?rev=1199251&r1=1199250&r2=1199251&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/KeywordIndex.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/KeywordIndex.java Tue Nov 8 14:08:24 2011 @@ -191,9 +191,12 @@ public class KeywordIndex { } List<GenericValue> toBeStored = FastList.newInstance(); + int keywordMaxLength = Integer.parseInt(UtilProperties.getPropertyValue("prodsearch", "product.keyword.max.length")); for (Map.Entry<String, Long> entry: keywords.entrySet()) { - GenericValue productKeyword = delegator.makeValue("ProductKeyword", UtilMisc.toMap("productId", product.getString("productId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); - toBeStored.add(productKeyword); + if (entry.getKey().length() <= keywordMaxLength) { + GenericValue productKeyword = delegator.makeValue("ProductKeyword", UtilMisc.toMap("productId", product.getString("productId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); + toBeStored.add(productKeyword); + } } if (toBeStored.size() > 0) { if (Debug.verboseOn()) Debug.logVerbose("[KeywordIndex.indexKeywords] Storing " + toBeStored.size() + " keywords for productId " + product.getString("productId"), module); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |