zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add migration script

Browse Source 
- Rename some tables
This commit is contained in:
Paulo Gustavo Veiga
2012-06-22 01:34:33 -03:00
parent 10e869ab70
commit 2d8fa5c259
9 changed files with 74 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml
View File

@@ -1,38 +1,38 @@
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="com.wisemapping.model.Collaborator" table="COLABORATOR">
<id name="id">
<generator class="increment"/>
</id>
<property name="email"/>
<property name="creationDate" column="creation_date"/>
<set name="collaborations"
cascade="all, delete-orphan"
inverse="true">
<key column="COLABORATOR_ID" not-null="true"/>
<one-to-many class="com.wisemapping.model.Collaboration"/>
</set>
<joined-subclass name="com.wisemapping.model.User" table="USER">
<key column="COLABORATOR_ID"/>
<property name="username" not-null="true"/>
<property name="firstname"/>
<property name="lastname"/>
<property name="password"/>
<property name="activationDate" column="activation_date"/>
<property name="activationCode"/>
<property name="allowSendEmail"/>
<set name="tags" table="TAG">
<key column="user_id"/>
<element column="name" type="string"/>
</set>
</joined-subclass>
</class>
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="com.wisemapping.model.Collaborator" table="COLLABORATOR">
<id name="id">
<generator class="increment"/>
</id>
<property name="email"/>
<property name="creationDate" column="creation_date"/>
<set name="collaborations"
cascade="all, delete-orphan"
inverse="true">
<key column="COLABORATOR_ID" not-null="true"/>
<one-to-many class="com.wisemapping.model.Collaboration"/>
</set>
<joined-subclass name="com.wisemapping.model.User" table="USER">
<key column="COLABORATOR_ID"/>
<property name="username" not-null="true"/>
<property name="firstname"/>
<property name="lastname"/>
<property name="password"/>
<property name="activationDate" column="activation_date"/>
<property name="activationCode"/>
<property name="allowSendEmail"/>
<set name="tags" table="TAG">
<key column="user_id"/>
<element column="name" type="string"/>
</set>
</joined-subclass>
</class>
</hibernate-mapping>

10
wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp
View File

@@ -14,10 +14,12 @@
var iframeWindow = $('dialogContentIframe').contentWindow;
var delay = iframeWindow.submitDialogForm();
if (MooDialog.Request.active && !delay) {
MooDialog.Request.active.close();
} else {
MooDialog.Request.active.close.delay(3000,MooDialog.Request.active);
if (MooDialog.Request.active) {
if (!delay) {
MooDialog.Request.active.close();
} else {
MooDialog.Request.active.close.delay(3000, MooDialog.Request.active);
}
}
});