Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -ra0cb40afd5688f43dc89a3cc70f202ff7c00569f -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision a0cb40afd5688f43dc89a3cc70f202ff7c00569f)
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -40,7 +40,6 @@
allow_insert_wiki_link smallint,
allow_insert_external_link smallint,
allow_revert_page smallint,
- allow_upload smallint,
maximum_reply integer,
minimum_reply integer,
reflect_instructions varchar(255),
@@ -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_rich_editor,
- allow_new_wiki_page,allow_attach_image,allow_insert_wiki_link,allow_insert_external_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,0);
+ allow_new_wiki_page,allow_attach_image,allow_insert_wiki_link,allow_insert_external_link,allow_revert_page,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 -ra0cb40afd5688f43dc89a3cc70f202ff7c00569f -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision a0cb40afd5688f43dc89a3cc70f202ff7c00569f)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java (.../Wiki.java) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -61,7 +61,6 @@
private boolean allowInsertWikiLink;
private boolean allowInsertExternalLink;
private boolean allowRevertPage;
- private boolean allowUpload;
private int maximumReply;
private int minimumReply;
@@ -501,16 +500,6 @@
this.allowRevertPage = allowRevertPage;
}
/**
- * @hibernate.property column="allow_upload"
- * @return
- */
- public boolean isAllowUpload() {
- return allowUpload;
- }
- public void setAllowUpload(boolean allowUpload) {
- this.allowUpload = allowUpload;
- }
- /**
* @hibernate.property column="maximum_reply"
* @return
*/
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -radd116f9af357e74cbd2fac156232300a1bf7f35 -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -916,7 +916,6 @@
toolContentObj.setAllowInsertExternalLink(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);
toolContentObj.setContentInUse(Boolean.FALSE);
toolContentObj.setCreated(now);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -radd116f9af357e74cbd2fac156232300a1bf7f35 -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -59,7 +59,6 @@
public static final String TOOL_URL_BASE = "/lams/tool/lawiki10/";
public static final String WIKI_ID = "wiki_id";
- public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
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_WIKI_LINKS = "allowInsertWikiLinks";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -radd116f9af357e74cbd2fac156232300a1bf7f35 -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -222,7 +222,6 @@
sessionMap.put(AttributeNames.ATTR_MODE, mode);
sessionMap.put(WikiConstants.ATTR_FINISHED_LOCK, new Boolean(lock));
sessionMap.put(WikiConstants.ATTR_USER_FINISHED, wikiUser.isSessionFinished());
- sessionMap.put(WikiConstants.ATTR_ALLOW_UPLOAD,wiki.isAllowUpload());
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_WIKI_LINKS,wiki.isAllowInsertWikiLink());
@@ -618,7 +617,6 @@
dto.setHasAttachment(false);
request.setAttribute(WikiConstants.AUTHORING_TOPIC, dto);
SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(WebUtil.readStrParam(request, WikiConstants.ATTR_SESSION_MAP_ID));
- request.setAttribute(WikiConstants.ATTR_ALLOW_UPLOAD, sessionMap.get(WikiConstants.ATTR_ALLOW_UPLOAD));
return mapping.findForward("success");
}
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -ra0cb40afd5688f43dc89a3cc70f202ff7c00569f -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision a0cb40afd5688f43dc89a3cc70f202ff7c00569f)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java (.../WikiForm.java) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -118,7 +118,6 @@
wiki.setAllowInsertWikiLink(false);
wiki.setAllowInsertExternalLink(false);
wiki.setAllowRevertPage(false);
- wiki.setAllowUpload(false);
wiki.setReflectOnActivity(false);
}
//-------------------------get/set methods----------------
Index: lams_tool_wiki_orig/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r16be4f178e2ed2998569f494ebe63cf5066836a6 -rffeda5a0da2bb420c0f2fe6f9669874be9401e6d
--- lams_tool_wiki_orig/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
+++ lams_tool_wiki_orig/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision ffeda5a0da2bb420c0f2fe6f9669874be9401e6d)
@@ -16,19 +16,6 @@
<%@include file="bodyarea.jsp"%>
-
-
-
-
-
-
-
-
-
- <%@ include file="/jsps/learning/message/msgattachment.jsp"%>
-
-
-