Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf30c16566d5630b5aa1867d41230595773d14d42 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f30c16566d5630b5aa1867d41230595773d14d42)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -136,6 +136,7 @@
label.authoring.advance.allow.new.wiki.page =Allow learners to create new wiki pages
label.authoring.advance.allow.attach.image =Allow learners to attach images
label.authoring.advance.allow.insert.link =Allow learners to insert links
+label.authoring.advance.allow.revert.page =Allow learners to revert pages to previous versions
error.pageContent.required =Page content cannot be blank.
error.wikiTitle.required =Wiki title can not be blank.
label.default.user.name =Instructor
Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf30c16566d5630b5aa1867d41230595773d14d42 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f30c16566d5630b5aa1867d41230595773d14d42)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -136,6 +136,7 @@
label.authoring.advance.allow.new.wiki.page =Allow learners to create new wiki pages
label.authoring.advance.allow.attach.image =Allow learners to attach images
label.authoring.advance.allow.insert.link =Allow learners to insert links
+label.authoring.advance.allow.revert.page =Allow learners to revert pages to previous versions
error.pageContent.required =Page content cannot be blank.
error.wikiTitle.required =Wiki title can not be blank.
label.default.user.name =Instructor
Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -38,6 +38,7 @@
allow_new_wiki_page smallint,
allow_attach_image smallint,
allow_insert_link smallint,
+ allow_revert_page smallint,
allow_upload smallint,
maximum_reply integer,
minimum_reply integer,
@@ -118,8 +119,8 @@
INSERT INTO tl_lawiki10_wiki (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_rich_editor,
- allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_upload,maximum_reply, minimum_reply,reflect_on_activity)
-VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,0);
+ allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_revert_page,allow_upload,maximum_reply, minimum_reply,reflect_on_activity)
+VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,0,0);
INSERT INTO `tl_lawiki10_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `is_authored`, `is_anonymous`, `wiki_session_uid`, `parent_uid`, `wiki_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES
(1,NOW(),NOW(),NOW(),null,null,'Wiki Page','Wiki content',1,0,NULL,NULL,1,0,0,NULL);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -59,6 +59,7 @@
private boolean allowNewWikiPage;
private boolean allowAttachImage;
private boolean allowInsertLink;
+ private boolean allowRevertPage;
private boolean allowUpload;
private int maximumReply;
private int minimumReply;
@@ -479,9 +480,19 @@
this.allowInsertLink = allowInsertLink;
}
/**
+ * @hibernate.property column="allow_revert_page"
+ * @return
+ */
+ public boolean isAllowRevertPage() {
+ return allowRevertPage;
+ }
+ public void setAllowRevertPage(boolean allowRevertPage) {
+ this.allowRevertPage = allowRevertPage;
+ }
+ /**
* @hibernate.property column="allow_upload"
* @return
- */
+ */
public boolean isAllowUpload() {
return allowUpload;
}
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -913,6 +913,7 @@
toolContentObj.setAllowNewWikiPage(Boolean.FALSE); // this is the default value
toolContentObj.setAllowAttachImage(Boolean.TRUE); // this is the default value
toolContentObj.setAllowInsertLink(Boolean.FALSE); // this is the default value
+ toolContentObj.setAllowRevertPage(Boolean.FALSE); // this is the default value
//toolContentObj.setAllowRichEditor(Boolean.FALSE);
toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
toolContentObj.setContentId(toolContentId);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -63,6 +63,7 @@
public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages";
public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages";
public static final String ATTR_ALLOW_INSERT_LINKS = "allowInsertLinks";
+ public static final String ATTR_ALLOW_REVERT_PAGES = "allowRevertPages";
public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
public static final String ONLINE_ATTACHMENT = "online_att";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -226,6 +226,7 @@
sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_WIKI_PAGES,wiki.isAllowNewWikiPage());
sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage());
sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_LINKS,wiki.isAllowInsertLink());
+ sessionMap.put(WikiConstants.ATTR_ALLOW_REVERT_PAGES,wiki.isAllowRevertPage());
sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
sessionMap.put(WikiConstants.ATTR_REFLECTION_INSTRUCTION,wiki.getReflectInstructions());
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -116,6 +116,7 @@
wiki.setAllowNewWikiPage(false);
wiki.setAllowAttachImage(false);
wiki.setAllowInsertLink(false);
+ wiki.setAllowRevertPage(false);
wiki.setAllowUpload(false);
wiki.setReflectOnActivity(false);
}
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -r56a28a3bc9ee71dbde383b407cc475f68d5d6423
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 56a28a3bc9ee71dbde383b407cc475f68d5d6423)
@@ -41,6 +41,15 @@
+
+
+
+
+
+