Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5f3ae1b0faf82f8c9632f9568345f5475e2c8442 -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5f3ae1b0faf82f8c9632f9568345f5475e2c8442)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -152,8 +152,6 @@
error.less.mini.post =You must contribute at least {0} posts before finish.
error.must.have.topic =Please add at least 1 topic when "allow learners to create new topics" option is off.
msg.mark.released =Marks in {0} have been released.
-label.authoring.advance.allow.new.topics =Allow learners to create new topics
-label.authoring.advance.number.reply =Number of posts per learner per topic
label.authoring.advance.minimum.reply =Minimum:
monitoring.user.reflection =Reflection
topic.message.attachment.hidden =Message attachment hidden
Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5f3ae1b0faf82f8c9632f9568345f5475e2c8442 -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 5f3ae1b0faf82f8c9632f9568345f5475e2c8442)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -152,8 +152,6 @@
error.less.mini.post =You must contribute at least {0} posts before finish.
error.must.have.topic =Please add at least 1 topic when "allow learners to create new topics" option is off.
msg.mark.released =Marks in {0} have been released.
-label.authoring.advance.allow.new.topics =Allow learners to create new topics
-label.authoring.advance.number.reply =Number of posts per learner per topic
label.authoring.advance.minimum.reply =Minimum:
monitoring.user.reflection =Reflection
topic.message.attachment.hidden =Message attachment hidden
Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -rf461583f3022a937d0a06aee931827145f4a1c1c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision f461583f3022a937d0a06aee931827145f4a1c1c)
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -36,7 +36,6 @@
content_id bigint unique,
allow_edit smallint,
allow_rich_editor smallint,
- allow_new_topic smallint,
allow_new_wiki_page smallint,
allow_upload smallint,
maximum_reply integer,
@@ -120,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_edit,allow_rich_editor,
- allow_new_topic,allow_new_wiki_page,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity)
-VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,1,0,1,0,1,5000,0);
+ allow_new_wiki_page,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity)
+VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,0,1,0,1,5000,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/db/sql/table-schema.sql
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/db/sql/table-schema.sql (.../table-schema.sql) (revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/db/sql/table-schema.sql (.../table-schema.sql) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -19,7 +19,7 @@
drop table if exists tl_lawiki10_report;
drop table if exists tl_lawiki10_tool_session;
create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, message_uid bigint, primary key (uid));
-create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
+create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_upload bit, maximum_reply integer, minimum_reply integer, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
create table tl_lawiki10_wiki_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), session_finished bit, primary key (uid));
create table tl_lawiki10_message (uid bigint not null auto_increment, create_date datetime, last_reply_date datetime, update_date datetime, create_by bigint, modified_by bigint, subject varchar(255), body text, is_authored bit, is_anonymous bit, wiki_session_uid bigint, parent_uid bigint, wiki_uid bigint, reply_number integer, hide_flag bit, report_id bigint, primary key (uid));
create table tl_lawiki10_message_seq (uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid));
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java
===================================================================
diff -u -rf461583f3022a937d0a06aee931827145f4a1c1c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision f461583f3022a937d0a06aee931827145f4a1c1c)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -57,7 +57,6 @@
private boolean runOffline;
private boolean allowAnonym;
private boolean allowEdit;
- private boolean allowNewTopic;
private boolean allowNewWikiPage;
private boolean allowUpload;
private int maximumReply;
@@ -482,16 +481,6 @@
this.toolContentHandler = toolContentHandler;
}
/**
- * @hibernate.property column="allow_new_topic"
- * @return
- */
- public boolean isAllowNewTopic() {
- return allowNewTopic;
- }
- public void setAllowNewTopic(boolean allowNewTopic) {
- this.allowNewTopic = allowNewTopic;
- }
- /**
* @hibernate.property column="allow_new_wiki_page"
* @return
*/
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -911,7 +911,6 @@
toolContentObj.setAllowAnonym(Boolean.FALSE);
toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
- toolContentObj.setAllowNewTopic(Boolean.TRUE);
toolContentObj.setAllowNewWikiPage(Boolean.TRUE);
//toolContentObj.setAllowRichEditor(Boolean.FALSE);
toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -61,7 +61,6 @@
public static final String ATTR_ALLOW_EDIT = "allowEdit";
public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
- public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics";
public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages";
public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
public static final String ATTR_LIMITED_CHARS = "limitedChars";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -908,7 +908,7 @@
// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
// }
boolean allowNewWikiPage = form.getWiki().isAllowNewWikiPage();
-// define it later mode(TEACHER): need read out AllowNewTopic flag rather than get from HTML form
+// define it later mode(TEACHER): need read out AllowNewWikiPage flag rather than get from HTML form
//becuase defineLater does not include this field
if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
wikiService = getWikiManager();
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -231,8 +231,7 @@
sessionMap.put(WikiConstants.ATTR_USER_FINISHED, wikiUser.isSessionFinished());
sessionMap.put(WikiConstants.ATTR_ALLOW_EDIT, wiki.isAllowEdit());
sessionMap.put(WikiConstants.ATTR_ALLOW_UPLOAD,wiki.isAllowUpload());
- //sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_TOPICS,wiki.isAllowNewTopic());
- sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_TOPICS,wiki.isAllowNewWikiPage());
+ sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_WIKI_PAGES,wiki.isAllowNewWikiPage());
sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
sessionMap.put(WikiConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -116,7 +116,6 @@
//wiki.setAllowRichEditor(false);
wiki.setLimitedInput(false);
wiki.setLockWhenFinished(false);
- wiki.setAllowNewTopic(false);
wiki.setAllowNewWikiPage(false);
wiki.setAllowUpload(false);
wiki.setReflectOnActivity(false);
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp (.../advance.jsp) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -90,27 +90,7 @@
-
-
-
Index: lams_tool_wiki_orig/web/jsps/learning/viewwiki.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r7aa2861ddc577b49cef219ab58f43596019f10ec
--- lams_tool_wiki_orig/web/jsps/learning/viewwiki.jsp (.../viewwiki.jsp) (revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/learning/viewwiki.jsp (.../viewwiki.jsp) (revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
@@ -43,7 +43,7 @@
-
+