You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2010/02/23 11:45:09 UTC
svn commit: r915274 - in /ofbiz/trunk/specialpurpose/assetmaint: data/
webapp/assetmaint/WEB-INF/actions/assetmaint/ webapp/assetmaint/error/
Author: mor
Date: Tue Feb 23 10:45:08 2010
New Revision: 915274
URL: http://svn.apache.org/viewvc?rev=915274&view=rev
Log:
Added missing svn properties to files under assetmaint component.
Modified:
ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml (props changed)
ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml (props changed)
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy (contents, props changed)
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp (props changed)
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp (props changed)
Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy?rev=915274&r1=915273&r2=915274&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy Tue Feb 23 10:45:08 2010
@@ -1,37 +1,37 @@
-/*
- * 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.
- */
-
-import org.ofbiz.entity.*;
-import org.ofbiz.entity.condition.*;
-import org.ofbiz.entity.util.*;
-
-// This is a small script to set things up when the EditFixedAssetMaint
-// screen is called from one of the WorkEffort calendar screens.
-// The URL coming from WorkEffort does not contain the maintHistSeqId parameter,
-// so this script will look it up using the workEffortId parameter.
-maintHistSeqId = parameters.maintHistSeqId;
-workEffortId = parameters.workEffortId;
-
-if (!maintHistSeqId && workEffortId) {
- fixedAssetMaint = EntityUtil.getFirst(delegator.findList("FixedAssetMaint", EntityCondition.makeCondition([scheduleWorkEffortId : workEffortId]), null, null, null, false));
- if (fixedAssetMaint) {
- parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
- parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
- }
+/*
+ * 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.
+ */
+
+import org.ofbiz.entity.*;
+import org.ofbiz.entity.condition.*;
+import org.ofbiz.entity.util.*;
+
+// This is a small script to set things up when the EditFixedAssetMaint
+// screen is called from one of the WorkEffort calendar screens.
+// The URL coming from WorkEffort does not contain the maintHistSeqId parameter,
+// so this script will look it up using the workEffortId parameter.
+maintHistSeqId = parameters.maintHistSeqId;
+workEffortId = parameters.workEffortId;
+
+if (!maintHistSeqId && workEffortId) {
+ fixedAssetMaint = EntityUtil.getFirst(delegator.findList("FixedAssetMaint", EntityCondition.makeCondition([scheduleWorkEffortId : workEffortId]), null, null, null, false));
+ if (fixedAssetMaint) {
+ parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
+ parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
+ }
}
\ No newline at end of file
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Re: svn commit: r915274 - in /ofbiz/trunk/specialpurpose/assetmaint:
data/ webapp/assetmaint/WEB-INF/actions/assetmaint/ webapp/assetmaint/error/
Posted by Ravindra Mandre <ra...@gmail.com>.
On Thu, Feb 25, 2010 at 11:57 AM, Ravindra Mandre <ra...@gmail.com>wrote:
>
>
> On Tue, Feb 23, 2010 at 4:15 PM, <mo...@apache.org> wrote:
>
>> Author: mor
>> Date: Tue Feb 23 10:45:08 2010
>> New Revision: 915274
>>
>> URL: http://svn.apache.org/viewvc?rev=915274&view=rev
>> Log:
>> Added missing svn properties to files under assetmaint component.
>>
>> Modified:
>> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
>> (props changed)
>> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
>> (props changed)
>>
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>> (contents, props changed)
>>
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
>> (props changed)
>>
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
>> (props changed)
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/xml
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/xml
>>
>> Modified:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy?rev=915274&r1=915273&r2=915274&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>> (original)
>> +++
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>> Tue Feb 23 10:45:08 2010
>> @@ -1,37 +1,37 @@
>> -/*
>> - * 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.
>> - */
>> -
>> -import org.ofbiz.entity.*;
>> -import org.ofbiz.entity.condition.*;
>> -import org.ofbiz.entity.util.*;
>> -
>> -// This is a small script to set things up when the EditFixedAssetMaint
>> -// screen is called from one of the WorkEffort calendar screens.
>> -// The URL coming from WorkEffort does not contain the maintHistSeqId
>> parameter,
>> -// so this script will look it up using the workEffortId parameter.
>> -maintHistSeqId = parameters.maintHistSeqId;
>> -workEffortId = parameters.workEffortId;
>> -
>> -if (!maintHistSeqId && workEffortId) {
>> - fixedAssetMaint =
>> EntityUtil.getFirst(delegator.findList("FixedAssetMaint",
>> EntityCondition.makeCondition([scheduleWorkEffortId : workEffortId]), null,
>> null, null, false));
>> - if (fixedAssetMaint) {
>> - parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
>> - parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
>> - }
>> +/*
>> + * 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.
>> + */
>> +
>> +import org.ofbiz.entity.*;
>> +import org.ofbiz.entity.condition.*;
>> +import org.ofbiz.entity.util.*;
>> +
>>
>
> According to groovy best practices we should import only those classes
> which are to be used . we should avoid all import using *.
>
> Ravindra Mandre
>
>
>
>> +// This is a small script to set things up when the EditFixedAssetMaint
>> +// screen is called from one of the WorkEffort calendar screens.
>> +// The URL coming from WorkEffort does not contain the maintHistSeqId
>> parameter,
>> +// so this script will look it up using the workEffortId parameter.
>> +maintHistSeqId = parameters.maintHistSeqId;
>> +workEffortId = parameters.workEffortId;
>> +
>> +if (!maintHistSeqId && workEffortId) {
>> + fixedAssetMaint =
>> EntityUtil.getFirst(delegator.findList("FixedAssetMaint",
>> EntityCondition.makeCondition([scheduleWorkEffortId : workEffortId]), null,
>> null, null, false));
>> + if (fixedAssetMaint) {
>> + parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
>> + parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
>> + }
>> }
>> \ No newline at end of file
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>>
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = "Date Rev Author URL Id"
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = "Date Rev Author URL Id"
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
>>
>> ------------------------------------------------------------------------------
>> svn:keywords = "Date Rev Author URL Id"
>>
>> Propchange:
>> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
>>
>> ------------------------------------------------------------------------------
>> svn:mime-type = text/plain
>>
>>
>>
>
Re: svn commit: r915274 - in /ofbiz/trunk/specialpurpose/assetmaint:
data/ webapp/assetmaint/WEB-INF/actions/assetmaint/ webapp/assetmaint/error/
Posted by Ravindra Mandre <ra...@gmail.com>.
On Tue, Feb 23, 2010 at 4:15 PM, <mo...@apache.org> wrote:
> Author: mor
> Date: Tue Feb 23 10:45:08 2010
> New Revision: 915274
>
> URL: http://svn.apache.org/viewvc?rev=915274&view=rev
> Log:
> Added missing svn properties to files under assetmaint component.
>
> Modified:
> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
> (props changed)
> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
> (props changed)
>
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
> (contents, props changed)
>
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
> (props changed)
>
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
> (props changed)
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/xml
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
>
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/xml
>
> Modified:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy?rev=915274&r1=915273&r2=915274&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
> (original)
> +++
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
> Tue Feb 23 10:45:08 2010
> @@ -1,37 +1,37 @@
> -/*
> - * 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.
> - */
> -
> -import org.ofbiz.entity.*;
> -import org.ofbiz.entity.condition.*;
> -import org.ofbiz.entity.util.*;
> -
> -// This is a small script to set things up when the EditFixedAssetMaint
> -// screen is called from one of the WorkEffort calendar screens.
> -// The URL coming from WorkEffort does not contain the maintHistSeqId
> parameter,
> -// so this script will look it up using the workEffortId parameter.
> -maintHistSeqId = parameters.maintHistSeqId;
> -workEffortId = parameters.workEffortId;
> -
> -if (!maintHistSeqId && workEffortId) {
> - fixedAssetMaint =
> EntityUtil.getFirst(delegator.findList("FixedAssetMaint",
> EntityCondition.makeCondition([scheduleWorkEffortId : workEffortId]), null,
> null, null, false));
> - if (fixedAssetMaint) {
> - parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
> - parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
> - }
> +/*
> + * 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.
> + */
> +
> +import org.ofbiz.entity.*;
> +import org.ofbiz.entity.condition.*;
> +import org.ofbiz.entity.util.*;
> +
>
According to groovy best practices we should import only those classes which
are to be used . we should avoid import.
Ravindra Mandre
> +// This is a small script to set things up when the EditFixedAssetMaint
> +// screen is called from one of the WorkEffort calendar screens.
> +// The URL coming from WorkEffort does not contain the maintHistSeqId
> parameter,
> +// so this script will look it up using the workEffortId parameter.
> +maintHistSeqId = parameters.maintHistSeqId;
> +workEffortId = parameters.workEffortId;
> +
> +if (!maintHistSeqId && workEffortId) {
> + fixedAssetMaint =
> EntityUtil.getFirst(delegator.findList("FixedAssetMaint",
> EntityCondition.makeCondition([scheduleWorkEffortId : workEffortId]), null,
> null, null, false));
> + if (fixedAssetMaint) {
> + parameters.fixedAssetId = fixedAssetMaint.fixedAssetId;
> + parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId;
> + }
> }
> \ No newline at end of file
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>
> ------------------------------------------------------------------------------
> svn:keywords = "Date Rev Author URL Id"
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
>
> ------------------------------------------------------------------------------
> svn:keywords = "Date Rev Author URL Id"
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error403.jsp
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
>
> ------------------------------------------------------------------------------
> svn:keywords = "Date Rev Author URL Id"
>
> Propchange:
> ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/error/error404.jsp
>
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
>
>