|
From: <ssk...@vh...> - 2006-06-22 13:06:00
|
Author: sskracic
Date: 2006-06-22 15:00:58 +0200 (Thu, 22 Jun 2006)
New Revision: 1232
Modified:
trunk/ccm-ldn-terms/application.xml
trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/Term.java
Log:
The creation of a model category, when term is being created from scratch,
was put in the wrong place.
Modified: trunk/ccm-ldn-terms/application.xml
===================================================================
--- trunk/ccm-ldn-terms/application.xml 2006-06-22 12:37:05 UTC (rev 1231)
+++ trunk/ccm-ldn-terms/application.xml 2006-06-22 13:00:58 UTC (rev 1232)
@@ -3,7 +3,7 @@
name="ccm-ldn-terms"
prettyName="Terms"
version="6.3.1"
- release="1">
+ release="2">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.3.3" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>
Modified: trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/Term.java
===================================================================
--- trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/Term.java 2006-06-22 12:37:05 UTC (rev 1231)
+++ trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/Term.java 2006-06-22 13:00:58 UTC (rev 1232)
@@ -57,8 +57,6 @@
public static final String NAME = MODEL + "." + Category.NAME;
public static final String DESCRIPTION = MODEL + "." + Category.DESCRIPTION;
- private boolean m_isNew = false;
-
Term() {
this(BASE_DATA_OBJECT_TYPE);
}
@@ -71,12 +69,6 @@
super(dobj);
}
- public void initialize() {
- super.initialize();
-
- m_isNew = isNew();
- }
-
/**
* Creates a new term within a domain. All
* parameters are required except for shortcut
@@ -94,6 +86,8 @@
Domain domain) {
Term term = new Term();
+ term.set(MODEL, new Category());
+
term.setUniqueID(uniqueID);
term.setDomain(domain);
term.setName(name);
@@ -444,11 +438,4 @@
return perl5.substitute("s/[^a-zA-Z0-9_]/-/g", name).toLowerCase();
}
- protected void beforeSave() {
- if (m_isNew && get(MODEL) == null) {
- set(MODEL, new Category());
- }
- super.beforeSave();
- }
-
}
|