[openmeetings] 07/09: [OPENMEETINGS-1864] restore is implemented
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 20d0e1fe62e7906213a4eaec5f7ca906bc055929
Author: Maxim Solodovnik
AuthorDate: Sun Apr 15 20:49:08 2018 +0700
[OPENMEETINGS-1864] restore is implemented
---
.../openmeetings/web/admin/AdminBaseForm.java | 58 +---
.../openmeetings/web/admin/AdminSavePanel.html | 8 +--
.../openmeetings/web/admin/AdminSavePanel.java | 63 +++---
.../openmeetings/web/admin/groups/GroupForm.java | 11 ++--
.../openmeetings/web/admin/labels/LangPanel.html | 46
.../openmeetings/web/admin/users/UserForm.java | 11 +++-
.../web/app/Application.properties.xml | 2 +
.../web/common/FormSaveRefreshPanel.java | 17 ++
openmeetings-web/src/main/webapp/css/general.css | 11
9 files changed, 128 insertions(+), 99 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
index c6f300c..9fb1dc2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
@@ -51,8 +51,8 @@ public abstract class AdminBaseForm extends Form {
}
@Override
- protected void onSaveError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onSaveError(target, form);
+ protected void onError(AjaxRequestTarget target,
Form form) {
+ AdminBaseForm.this.onError(target, form);
}
@Override
@@ -61,28 +61,23 @@ public abstract class AdminBaseForm extends Form {
}
@Override
- protected void onNewError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onNewError(target, form);
- }
-
- @Override
protected void onRefreshSubmit(AjaxRequestTarget
target, Form form) {
AdminBaseForm.this.onRefreshSubmit(target,
form);
}
@Override
- protected void onRefreshError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onRefreshError(target, form);
+ protected void onDeleteSubmit(AjaxRequestTarget target,
Form form) {
+ AdminBaseForm.this.onDeleteSubmit(target, form);
}
@Override
- protected void onDeleteSubmit(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onDeleteSubmit(target, form);
+ protected void onPurgeSubmit(AjaxRequestTarget target,
Form form) {
+ AdminBaseForm.this.onPurgeSubmit(target, form);
}
@Override
- protected void onDeleteError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onDeleteError(target, form);
+ protected void onRestoreSubmit(AjaxRequestTarget
target, Form form) {
+ AdminBaseForm.this.onRestoreSubmit(target,
form);
}
};
add(savePanel);
@@ -109,9 +104,14 @@ public abstract class AdminBaseForm extends Form {
savePanel.setSaveVisible(visible);
}
- protected boolean isDelBtnVisible() {
- return true;
+ public void setPurgeVisible(boolean visible) {
+ savePanel.setPurgeVisible(visible);
}
+
+ public void setRestoreVisible(boolean visible) {
+ savePanel.setRestoreVisible(visible);
+ }
+
/**
* invoked when user press save button
*
@@ -126,7 +126,7 @@ public abstract class AdminBaseForm extends Form {
* @param target - ajax target to update form component
* @param form - Form being processed
*/
- protected void onSaveError(AjaxRequestTarget target, Form form) {
+ protected void onError(AjaxRequestTarget target, Form form) {
//no-op
}
@@ -139,16 +139,6 @@ public abstract class AdminBaseForm extends Form {
protected abstract void onNewSubmit(AjaxRequestTarget target, Form
form);
/**
-* invoked if new has error
-*
-* @param target - ajax target to update form component
-* @param form - Form being processed
-
[openmeetings] 07/09: [OPENMEETINGS-1864] restore is implemented
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
commit 58ac804ea60d6710a11747a4f41db1b57270499c
Author: Maxim Solodovnik
AuthorDate: Sun Apr 15 20:49:08 2018 +0700
[OPENMEETINGS-1864] restore is implemented
---
.../openmeetings/web/admin/AdminBaseForm.java | 58 +---
.../openmeetings/web/admin/AdminSavePanel.html | 8 +--
.../openmeetings/web/admin/AdminSavePanel.java | 63 +++---
.../openmeetings/web/admin/groups/GroupForm.java | 11 ++--
.../openmeetings/web/admin/labels/LangPanel.html | 46
.../openmeetings/web/admin/users/UserForm.java | 11 +++-
.../web/app/Application.properties.xml | 2 +
.../web/common/FormSaveRefreshPanel.java | 17 ++
openmeetings-web/src/main/webapp/css/general.css | 11
9 files changed, 128 insertions(+), 99 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
index c6f300c..9fb1dc2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
@@ -51,8 +51,8 @@ public abstract class AdminBaseForm extends Form {
}
@Override
- protected void onSaveError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onSaveError(target, form);
+ protected void onError(AjaxRequestTarget target,
Form form) {
+ AdminBaseForm.this.onError(target, form);
}
@Override
@@ -61,28 +61,23 @@ public abstract class AdminBaseForm extends Form {
}
@Override
- protected void onNewError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onNewError(target, form);
- }
-
- @Override
protected void onRefreshSubmit(AjaxRequestTarget
target, Form form) {
AdminBaseForm.this.onRefreshSubmit(target,
form);
}
@Override
- protected void onRefreshError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onRefreshError(target, form);
+ protected void onDeleteSubmit(AjaxRequestTarget target,
Form form) {
+ AdminBaseForm.this.onDeleteSubmit(target, form);
}
@Override
- protected void onDeleteSubmit(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onDeleteSubmit(target, form);
+ protected void onPurgeSubmit(AjaxRequestTarget target,
Form form) {
+ AdminBaseForm.this.onPurgeSubmit(target, form);
}
@Override
- protected void onDeleteError(AjaxRequestTarget target,
Form form) {
- AdminBaseForm.this.onDeleteError(target, form);
+ protected void onRestoreSubmit(AjaxRequestTarget
target, Form form) {
+ AdminBaseForm.this.onRestoreSubmit(target,
form);
}
};
add(savePanel);
@@ -109,9 +104,14 @@ public abstract class AdminBaseForm extends Form {
savePanel.setSaveVisible(visible);
}
- protected boolean isDelBtnVisible() {
- return true;
+ public void setPurgeVisible(boolean visible) {
+ savePanel.setPurgeVisible(visible);
}
+
+ public void setRestoreVisible(boolean visible) {
+ savePanel.setRestoreVisible(visible);
+ }
+
/**
* invoked when user press save button
*
@@ -126,7 +126,7 @@ public abstract class AdminBaseForm extends Form {
* @param target - ajax target to update form component
* @param form - Form being processed
*/
- protected void onSaveError(AjaxRequestTarget target, Form form) {
+ protected void onError(AjaxRequestTarget target, Form form) {
//no-op
}
@@ -139,16 +139,6 @@ public abstract class AdminBaseForm extends Form {
protected abstract void onNewSubmit(AjaxRequestTarget target, Form
form);
/**
-* invoked if new has error
-*
-* @param target - ajax target to update form component
-* @param form - Form being processed
-
