diff --git a/src/main/java/ru/ulstu/paper/controller/PaperView.java b/src/main/java/ru/ulstu/paper/controller/PaperView.java
index a6bc9eb..a6e627f 100644
--- a/src/main/java/ru/ulstu/paper/controller/PaperView.java
+++ b/src/main/java/ru/ulstu/paper/controller/PaperView.java
@@ -13,6 +13,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import java.io.Serializable;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
@Named
@@ -26,6 +27,10 @@ public class PaperView implements Serializable {
private Paper paper;
+ private Date newDeadlineDate;
+
+ private String newDeadlineDescription;
+
@PostConstruct
public void init() {
paper = paperService.findPaperById(Integer.valueOf(FacesUtil.getRequestParams().get("id")));
@@ -57,4 +62,20 @@ public class PaperView implements Serializable {
FacesUtil.showInfoMessage("Статья сохранена", "");
return Page.PAPER_LIST + "?faces-redirect=true";
}
+
+ public Date getNewDeadlineDate() {
+ return newDeadlineDate;
+ }
+
+ public void setNewDeadlineDate(Date newDeadlineDate) {
+ this.newDeadlineDate = newDeadlineDate;
+ }
+
+ public String getNewDeadlineDescription() {
+ return newDeadlineDescription;
+ }
+
+ public void setNewDeadlineDescription(String newDeadlineDescription) {
+ this.newDeadlineDescription = newDeadlineDescription;
+ }
}
diff --git a/src/main/resources/META-INF/resources/admin/user.xhtml b/src/main/resources/META-INF/resources/admin/user.xhtml
index 7738198..ec12052 100644
--- a/src/main/resources/META-INF/resources/admin/user.xhtml
+++ b/src/main/resources/META-INF/resources/admin/user.xhtml
@@ -41,15 +41,6 @@
-
-
-
-
-
-
-
-
-
@@ -59,6 +50,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/META-INF/resources/paper/paper.xhtml b/src/main/resources/META-INF/resources/paper/paper.xhtml
index a1bde3d..bb3668f 100644
--- a/src/main/resources/META-INF/resources/paper/paper.xhtml
+++ b/src/main/resources/META-INF/resources/paper/paper.xhtml
@@ -2,7 +2,8 @@
+ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+>
Редактирование статьи
@@ -32,23 +33,31 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -63,13 +72,11 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -102,16 +97,46 @@
itemLabel="#{author.userAbbreviate}"
itemValue="#{author}"/>
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+ action="#{papersView.deleteSelected}" ajax="true"
+ process="mainForm:papersRemoveButton"
+ update="messages mainForm:papersTable">
@@ -32,7 +36,7 @@
- te
+
-
-
-
-
+
+
+
+