This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 830c3f2 [OPENMEETINGS-1864] purge is improved
830c3f2 is described below
commit 830c3f264d4d859f1826030b0a2cbbd1e13af055
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Apr 25 22:34:31 2018 +0700
[OPENMEETINGS-1864] purge is improved
---
.../src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java | 6 +++++-
.../java/org/apache/openmeetings/db/entity/basic/ChatMessage.java | 2 +-
.../java/org/apache/openmeetings/db/entity/log/ConferenceLog.java | 2 ++
.../src/main/java/org/apache/openmeetings/db/entity/user/User.java | 4 ++--
.../java/org/apache/openmeetings/web/app/Application.properties.xml | 1 +
.../org/apache/openmeetings/web/app/Application_ar.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_bg.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_ca.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_cs.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_da.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_de.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_el.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_es.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_fa.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_fi.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_fr.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_gl.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_he.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_hu.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_id.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_it.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_ja.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_ko.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_nl.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_pl.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_pt.properties.xml | 3 +++
.../apache/openmeetings/web/app/Application_pt_BR.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_ru.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_sk.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_sv.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_th.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_tr.properties.xml | 3 +++
.../org/apache/openmeetings/web/app/Application_uk.properties.xml | 3 +++
.../apache/openmeetings/web/app/Application_zh_CN.properties.xml | 3 +++
.../apache/openmeetings/web/app/Application_zh_TW.properties.xml | 3 +++
.../java/org/apache/openmeetings/web/common/FormActionsPanel.java | 2 +-
36 files changed, 102 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index fb2211f..b4f2f3d 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -22,6 +22,7 @@ import static
org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
import static org.apache.openmeetings.util.DaoHelper.getStringParam;
import static org.apache.openmeetings.util.OpenmeetingsVariables.PARAM_USER_ID;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultLang;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultTimezone;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getMinLoginLength;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
@@ -336,6 +337,9 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
.setParameter("purged", "Purged User")
.setParameter("userId", u.getId())
.executeUpdate();
+ em.createNamedQuery("clearLogUserIpByUser")
+ .setParameter("userId", u.getId())
+ .executeUpdate();
if (!Strings.isEmpty(u.getAddress().getEmail())) {
em.createNamedQuery("purgeMailMessages")
.setParameter("email",
String.format("%%%s%%", u.getAddress().getEmail()))
@@ -354,7 +358,7 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
u.setLogin(purged);
u.setGroupUsers(new ArrayList<>());
u.setRights(new HashSet<>());
- u.setTimeZoneId(null);
+ u.setTimeZoneId(getDefaultTimezone());
File pic =
OmFileHelper.getUserProfilePicture(u.getId(), u.getPictureuri(), null);
u.setPictureuri(null);
ICrypt crypt = CryptProvider.get();
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
index 8c812f7..4cee3df 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
@@ -53,7 +53,7 @@ import org.simpleframework.xml.Root;
, @NamedQuery(name = "deleteChatGlobal", query = "DELETE FROM
ChatMessage c WHERE c.toUser IS NULL AND c.toRoom IS NULL")
, @NamedQuery(name = "deleteChatRoom", query = "DELETE FROM ChatMessage
c WHERE c.toUser IS NULL AND c.toRoom.id = :roomId")
, @NamedQuery(name = "deleteChatUser", query = "DELETE FROM ChatMessage
c WHERE c.toRoom IS NULL AND c.toUser.id = :userId")
- , @NamedQuery(name = "purgeChatUserName", query = "UPDATE ChatMessage c
SET c.fromName = :purged WHERE c.toUser.id = :userId")
+ , @NamedQuery(name = "purgeChatUserName", query = "UPDATE ChatMessage c
SET c.fromName = :purged WHERE c.fromUser.id = :userId")
})
@Table(name = "chat")
@Root(name = "ChatMessage")
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
index c95c707..d07d183 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
@@ -38,6 +38,8 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity;
@NamedQueries({
@NamedQuery(name = "getLogRecentRooms", query = "SELECT c FROM
ConferenceLog c "
+ "WHERE c.roomId IS NOT NULL AND c.type = :roomEnter and
c.userId = :userId ORDER BY c.inserted DESC")
+ , @NamedQuery(name = "clearLogUserIpByUser", query = "UPDATE
ConferenceLog c SET c.userip = NULL "
+ + "WHERE c.userip IS NOT NULL AND c.userId = :userId")
, @NamedQuery(name = "clearLogUserIp", query = "UPDATE ConferenceLog c
SET c.userip = NULL "
+ "WHERE c.userip IS NOT NULL AND c.inserted < :date")
})
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index 34a39c2..66b1839 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -233,7 +233,7 @@ public class User extends HistoricalEntity {
@Element(data = true, required = false)
private String activatehash;
- @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL,
orphanRemoval = true)
@JoinColumn(name = "address_id", insertable = true, updatable = true)
@ForeignKey(enabled = true)
@Element(name = "address", required = false)
@@ -245,7 +245,7 @@ public class User extends HistoricalEntity {
@ElementDependent
private List<GroupUser> groupUsers = new ArrayList<>();
- @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL,
orphanRemoval = true)
@PrimaryKeyJoinColumn(name="sip_user_id", referencedColumnName="id")
@Element(name = "sipUser", required = false)
private AsteriskSipUser sipUser;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 56bfff2..5c91898 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -1011,4 +1011,5 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
<entry key="admin.restore"><![CDATA[Restore]]></entry>
<entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index b18707e..43f883d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index ade99cb..2e325e4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 516866f..c5434b5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index a9eb788..66f4231 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 3ea1eea..bdf6edf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index f2f556b..d3fa048 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1014,4 +1014,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index f631bd4..1ca5d49 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index f901fc0..a4a9bbb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -1007,4 +1007,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 1548ed8..c851250 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -1001,4 +1001,7 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index b25d41f..df33568 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 2312f7f..28fb087 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -1001,4 +1001,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 9709cce..caa1d26 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 07b2a68..5c91898 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index dea96e9..3f4262e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -997,4 +997,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 9bb3832..5050a46 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 27cae61..a9337b6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -1010,4 +1010,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 0b63d58..586db3b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 28e6a71..fcf157f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 1d17908..86b0151 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 6490b73..2123cd5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 90c3fea..19a2f17 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index add6d2d..8b95979 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index c341c9c..cd33e3a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -1010,4 +1010,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Голосования]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Создать быстрый
опрос]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Собрать отзывы без
создания голосования]]></entry>
+ <entry key="admin.restore"><![CDATA[Восстановить]]></entry>
+ <entry key="admin.purge"><![CDATA[Уничтожить]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Вы действительно хотите
уничтожить этот объект? Это действие необратимо!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index c2e9443..c757688 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 0c69f67..e42c932 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 003ea44..7bc0b0e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 57f5b8e..09a506d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 408cbda..7dad201 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -1010,4 +1010,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 4857cfc..e7db131 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -999,4 +999,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 0574f77..2c11c30 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -1009,4 +1009,7 @@ see http://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="menu.polls"><![CDATA[Polls]]></entry>
<entry key="menu.polls.quick.title"><![CDATA[Create Quick
Poll]]></entry>
<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without
creating a poll]]></entry>
+ <entry key="admin.restore"><![CDATA[Restore]]></entry>
+ <entry key="admin.purge"><![CDATA[Purge]]></entry>
+ <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this
item? This can't be undone!]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java
index 142cb99..081b84d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java
@@ -82,7 +82,7 @@ public abstract class FormActionsPanel<T> extends Panel {
FormActionsPanel.this.onError(target, form);
}
});
- purgeBtn = new ConfirmableAjaxBorder("btn-purge",
getString("80"), getString("833"), form, null, true) {
+ purgeBtn = new ConfirmableAjaxBorder("btn-purge",
getString("admin.purge"), getString("admin.purge.desc"), form, null, true) {
private static final long serialVersionUID = 1L;
@Override
--
To stop receiving notification emails like this one, please contact
[email protected].
