Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -37,10 +37,6 @@ public static final short RESOURCE_TYPE_FILE = 2; - public static final short RESOURCE_TYPE_WEBSITE = 3; - - public static final short RESOURCE_TYPE_LEARNING_OBJECT = 4; - // for action forward name public static final String SUCCESS = "success"; @@ -80,8 +76,6 @@ public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST = "deletedItemAttachmmentList";; - public static final String ATT_LEARNING_OBJECT = "cpPackage"; - public static final String ATTR_RESOURCE_REVIEW_URL = "resourceItemReviewUrl"; public static final String ATTR_ENCODED_RESOURCE_REVIEW_URL = "encodedResourceItemReviewUrl"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20220217.sql =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20220217.sql (.../patch20220217.sql) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20220217.sql (.../patch20220217.sql) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -13,6 +13,12 @@ DROP TABLE tl_larsrc11_item_instruction; +-- remove zipped website and IMS package item types + +ALTER TABLE tl_larsrc11_resource_item DROP COLUMN organization_xml, + DROP COLUMN ims_schema, + DROP COLUMN init_item; + -- Put all sql statements above here -- If there were no errors, commit and restore autocommit to on Fisheye: Tag 326782acda142b33013dcb8a4b57ef62a5669914 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IContentPackageConverter.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 326782acda142b33013dcb8a4b57ef62a5669914 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IMSManifestException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 326782acda142b33013dcb8a4b57ef62a5669914 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/ImscpApplicationException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 326782acda142b33013dcb8a4b57ef62a5669914 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -55,7 +55,7 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - // Resource Type:1=URL,2=File,3=Website,4=Learning Object + // Resource Type:1=URL,2=File @Column(name = "item_type") private short type; @@ -68,15 +68,6 @@ @Column private String url; - @Column(name = "ims_schema") - private String imsSchema; - - @Column(name = "init_item") - private String initialItem; - - @Column(name = "organization_xml") - private String organizationXml; - @Column(name = "file_uuid") private Long fileUuid; @@ -171,30 +162,6 @@ this.instructions = description; } - public String getImsSchema() { - return imsSchema; - } - - public void setImsSchema(String imsSchema) { - this.imsSchema = imsSchema; - } - - public String getInitialItem() { - return initialItem; - } - - public void setInitialItem(String initialItem) { - this.initialItem = initialItem; - } - - public String getOrganizationXml() { - return organizationXml; - } - - public void setOrganizationXml(String organizationXml) { - this.organizationXml = organizationXml; - } - public String getTitle() { return title; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java =================================================================== diff -u -r77491c8baf27f5b5d8705ea6b306e8db142389e7 -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 77491c8baf27f5b5d8705ea6b306e8db142389e7) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -77,7 +77,7 @@ List getAuthoredItems(Long resourceUid); /** - * Upload resource item file to repository. i.e., single file, websize zip file, or learning object zip file. + * Upload resource item file to repository. i.e., single file * */ void uploadResourceItemFile(ResourceItem item, File file) throws UploadResourceFileException; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -24,11 +24,9 @@ package org.lamsfoundation.lams.tool.rsrc.service; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; @@ -84,7 +82,6 @@ import org.lamsfoundation.lams.tool.rsrc.dto.ResourceItemDTO; import org.lamsfoundation.lams.tool.rsrc.dto.SessionDTO; import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO; -import org.lamsfoundation.lams.tool.rsrc.ims.SimpleContentPackageConverter; import org.lamsfoundation.lams.tool.rsrc.model.Resource; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog; @@ -98,8 +95,6 @@ import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; -import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; import org.lamsfoundation.lams.web.util.AttributeNames; import com.fasterxml.jackson.databind.JsonNode; @@ -637,104 +632,20 @@ return node; } - private NodeKey processPackage(String packageDirectory, String initFile) throws UploadResourceFileException { - NodeKey node = null; - try { - node = resourceToolContentHandler.uploadPackage(packageDirectory, initFile); - } catch (InvalidParameterException e) { - throw new UploadResourceFileException(messageService.getMessage("error.msg.invaid.param.upload")); - } catch (RepositoryCheckedException e) { - throw new UploadResourceFileException(messageService.getMessage("error.msg.repository")); - } - return node; - } - @Override public void uploadResourceItemFile(ResourceItem item, File file) throws UploadResourceFileException { - try { - InputStream is = new FileInputStream(file); - String fileName = file.getName(); - // For file only upload one sigle file - if (item.getType() == ResourceConstants.RESOURCE_TYPE_FILE) { - NodeKey nodeKey = processFile(file); - item.setFileUuid(nodeKey.getUuid()); - item.setFileVersionId(nodeKey.getVersion()); - } - // need unzip upload, and check the initial item :default.htm/html or index.htm/html - if (item.getType() == ResourceConstants.RESOURCE_TYPE_WEBSITE) { - String packageDirectory = ZipFileUtil.expandZip(is, fileName); - String initFile = findWebsiteInitialItem(packageDirectory); - if (initFile == null) { - throw new UploadResourceFileException( - messageService.getMessage("error.msg.website.no.initial.file")); - } - item.setInitialItem(initFile); - // upload package - NodeKey nodeKey = processPackage(packageDirectory, initFile); - item.setFileUuid(nodeKey.getUuid()); - item.setFileVersionId(nodeKey.getVersion()); - } - // need unzip upload, and parse learning object information from XML file. - if (item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT) { - String packageDirectory = ZipFileUtil.expandZip(is, fileName); - SimpleContentPackageConverter cpConverter = new SimpleContentPackageConverter(packageDirectory); - String initFile = cpConverter.getDefaultItem(); - item.setInitialItem(initFile); - item.setImsSchema(cpConverter.getSchema()); - item.setOrganizationXml(cpConverter.getOrganzationXML()); - // upload package - NodeKey nodeKey = processPackage(packageDirectory, initFile); - item.setFileUuid(nodeKey.getUuid()); - item.setFileVersionId(nodeKey.getVersion()); - } - // create the package from the directory contents - item.setFileName(fileName); - } catch (ZipFileUtilException e) { - log.error(messageService.getMessage("error.msg.zip.file.exception") + " : " + e.toString()); - throw new UploadResourceFileException(messageService.getMessage("error.msg.zip.file.exception")); - } catch (FileNotFoundException e) { - log.error(messageService.getMessage("error.msg.file.not.found") + ":" + e.toString()); - throw new UploadResourceFileException(messageService.getMessage("error.msg.file.not.found")); - } catch (IOException e) { - log.error(messageService.getMessage("error.msg.io.exception") + ":" + e.toString()); - throw new UploadResourceFileException(messageService.getMessage("error.msg.io.exception")); + String fileName = file.getName(); + // For file only upload one sigle file + if (item.getType() == ResourceConstants.RESOURCE_TYPE_FILE) { + NodeKey nodeKey = processFile(file); + item.setFileUuid(nodeKey.getUuid()); + item.setFileVersionId(nodeKey.getVersion()); } + // create the package from the directory contents + item.setFileName(fileName); } /** - * Find out default.htm/html or index.htm/html in the given directory folder - * - * @param packageDirectory - * @return - */ - private String findWebsiteInitialItem(String packageDirectory) { - File file = new File(packageDirectory); - if (!file.isDirectory()) { - return null; - } - - File[] initFiles = file.listFiles(new FileFilter() { - @Override - public boolean accept(File pathname) { - if ((pathname == null) || (pathname.getName() == null)) { - return false; - } - String name = pathname.getName(); - if (name.endsWith("default.html") || name.endsWith("default.htm") || name.endsWith("index.html") - || name.endsWith("index.htm")) { - return true; - } - return false; - } - }); - if ((initFiles != null) && (initFiles.length > 0)) { - return initFiles[0].getName(); - } else { - return null; - } - } - - /** * Gets a message from resource bundle. Same as in JSP pages. * * @param key @@ -1270,8 +1181,6 @@ item.setFileType(JsonUtil.optString(itemData, "fileType")); item.setFileUuid(JsonUtil.optLong(itemData, "crUuid")); item.setFileVersionId(JsonUtil.optLong(itemData, "crVersionId")); - item.setImsSchema(JsonUtil.optString(itemData, "imsSchema")); - item.setOrganizationXml(JsonUtil.optString(itemData, "organizationXml")); item.setUrl(JsonUtil.optString(itemData, "url")); // TODO files - need to save it somehow, validate the file size, etc. Needed for websites, files & LO Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -78,9 +78,6 @@ public class AuthoringController { private static Logger log = Logger.getLogger(AuthoringController.class); - private static final int INIT_INSTRUCTION_COUNT = 2; - private static final String INSTRUCTION_ITEM_DESC_PREFIX = "instructionItemDesc"; - private static final String INSTRUCTION_ITEM_COUNT = "instructionCount"; private static final String ITEM_TYPE = "itemType"; @Autowired @@ -160,12 +157,6 @@ resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); } return "pages/authoring/parts/addfile"; - case 3: - resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - return "pages/authoring/parts/addwebsite"; - case 4: - resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - return "pages/authoring/parts/addlearningobject"; default: throw new IllegalArgumentException("Unknown item type" + item.getType()); } @@ -180,24 +171,13 @@ resourceItemForm.setSessionMapID(sessionMapID); short type = (short) WebUtil.readIntParam(request, AuthoringController.ITEM_TYPE); - List instructionList = new ArrayList<>(AuthoringController.INIT_INSTRUCTION_COUNT); - for (int idx = 0; idx < AuthoringController.INIT_INSTRUCTION_COUNT; idx++) { - instructionList.add(""); - } - request.setAttribute("instructionList", instructionList); request.setAttribute("resourceItemForm", resourceItemForm); switch (type) { case 1: return "pages/authoring/parts/addurl"; case 2: resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); return "pages/authoring/parts/addfile"; - case 3: - resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - return "pages/authoring/parts/addwebsite"; - case 4: - resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - return "pages/authoring/parts/addlearningobject"; default: throw new IllegalArgumentException("Unknown item type" + type); } @@ -225,12 +205,6 @@ case 2: resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); return "pages/authoring/parts/addfile"; - case 3: - resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - return "pages/authoring/parts/addwebsite"; - case 4: - resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - return "pages/authoring/parts/addlearningobject"; default: throw new IllegalArgumentException("Unknown item type" + resourceItemForm.getItemType()); } @@ -251,10 +225,6 @@ return "pages/authoring/parts/addurl"; case 2: return "pages/authoring/parts/addfile"; - case 3: - return "pages/authoring/parts/addwebsite"; - case 4: - return "pages/authoring/parts/addlearningobject"; default: throw new IllegalArgumentException("Unknown item type" + resourceItemForm.getItemType()); } @@ -601,12 +571,6 @@ if (itemIdx >= 0) { form.setItemIndex(String.valueOf(itemIdx)); } - - // FOR requirment from LDEV-754 - // add extra blank line for instructions - // for(int idx=0;idx) request.getSession().getAttribute(sessionMapID); } - -} +} \ No newline at end of file Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -551,22 +551,6 @@ } /** - * Get java.util.List from HttpSession by given name. - * - * @param request - * @param name - * @return - */ - private List getListFromSession(SessionMap sessionMap, String name) { - List list = (List) sessionMap.get(name); - if (list == null) { - list = new ArrayList(); - sessionMap.put(name, list); - } - return list; - } - - /** * Return ActionForward according to resource item type. * * @param type @@ -611,21 +595,9 @@ if (resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_URL) { if (StringUtils.isBlank(resourceItemForm.getUrl())) { errorMap.add("GLOBAL", messageService.getMessage(ResourceConstants.ERROR_MSG_URL_BLANK)); - // URL validation: Commom URL validate(1.3.0) work not very well: it can not support http://address:port - // format!!! - // UrlValidator validator = new UrlValidator(); - // if(!validator.isValid(itemForm.getUrl())) - // errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_INVALID_URL)); } } - // if(itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE - // ||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){ - // if(StringUtils.isBlank(itemForm.getDescription())) - // errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_DESC_BLANK)); - // } - if ((resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE) - || (resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT) - || (resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE)) { + if (resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE) { File uploadDir = FileUtil.getTmpFileUploadDir(resourceItemForm.getTmpFileUploadId()); if (uploadDir.canRead()) { File[] files = uploadDir.listFiles(); @@ -639,22 +611,6 @@ } else { errorMap.add("GLOBAL", "No file uploaded"); } -// if ((resourceItemForm.getFile() != null) -// && FileUtil.isExecutableFile(resourceItemForm.getFile().getOriginalFilename())) { -// errorMap.add("Global", messageService.getMessage("error.attachment.executable")); -// } -// -// // validate item size -// if (!FileValidatorUtil.validateFileSize(resourceItemForm.getFile(), false)) { -// errorMap.add("GLOBAL", messageService.getMessage("errors.maxfilesize", -// new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) })); -// } -// -// // for edit validate: file already exist -// if (!resourceItemForm.isHasFile() && ((resourceItemForm.getFile() == null) -// || StringUtils.isEmpty(resourceItemForm.getFile().getOriginalFilename()))) { -// errorMap.add("GLOBAL", messageService.getMessage(ResourceConstants.ERROR_MSG_FILE_BLANK)); -// } } } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java =================================================================== diff -u -raa971e902329c8ae01eae531db29bbc1a595f4ff -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision aa971e902329c8ae01eae531db29bbc1a595f4ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -41,8 +41,6 @@ import org.lamsfoundation.lams.tool.rsrc.service.IResourceService; import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -57,7 +55,7 @@ private IResourceService resourceService; /** - * Display main frame to display instrcution and item content. + * Display main frame to display item content. * * @throws UnsupportedEncodingException */ @@ -91,9 +89,6 @@ if (item == null) { return "error"; } - if (item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT) { - sessionMap.put(ResourceConstants.ATT_LEARNING_OBJECT, item); - } Integer itemIdx = WebUtil.readIntParam(request, ResourceConstants.PARAM_ITEM_INDEX, true); String reviewUrl = getReviewUrl(item, sessionMapID); @@ -102,8 +97,8 @@ request.setAttribute(ResourceConstants.ATTR_ENCODED_RESOURCE_REVIEW_URL, URLEncoder.encode(reviewUrl, "UTF-8")); } - request.setAttribute(ResourceConstants.ATTR_IS_DOWNLOAD, item.getType() == ResourceConstants.RESOURCE_TYPE_FILE - || item.getType() == ResourceConstants.RESOURCE_TYPE_WEBSITE); + request.setAttribute(ResourceConstants.ATTR_IS_DOWNLOAD, + item.getType() == ResourceConstants.RESOURCE_TYPE_FILE); request.setAttribute(ResourceConstants.ATTR_ALLOW_COMMENTS, item.isAllowComments()); @@ -133,7 +128,7 @@ if (item == null) { return "error"; } - + request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID); request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION, item.getInstructions()); return "pages/itemreview/instructionsnav"; @@ -145,11 +140,6 @@ /** * Return resource item according to ToolAccessMode. - * - * @param request - * @param sessionMap - * @param mode - * @return */ private ResourceItem getResourceItem(HttpServletRequest request, SessionMap sessionMap, String mode) { @@ -183,14 +173,8 @@ } break; case ResourceConstants.RESOURCE_TYPE_FILE: - case ResourceConstants.RESOURCE_TYPE_WEBSITE: url = "/download/?uuid=" + item.getFileUuid() + "&preferDownload=true"; break; - - case ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT: - url = Configuration.get(ConfigurationKeys.SERVER_URL) + "pages/learningobj/mainframe.jsp?sessionMapID=" - + sessionMapID; - break; } return url; } Index: lams_tool_larsrc/web/pages/authoring/basic.jsp =================================================================== diff -u -r26661ca85899e95649257c3d5e59eb6b9841ad3c -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 26661ca85899e95649257c3d5e59eb6b9841ad3c) +++ lams_tool_larsrc/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -19,7 +19,7 @@ } function previewItem(type,idx,sessionMapID){ - //1:url, 2:file, 3:website,4:learning object + //1:url, 2:file //This mode is special for unsaved author page. It is different with the author mode in preview var myUrl = ""+idx+"&sessionMapID="+sessionMapID; launchPopup(myUrl,"Review"); @@ -99,10 +99,6 @@   - -
Index: lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp =================================================================== diff -u -ra07430557603483e95a40ae22062e79b68a37778 -r326782acda142b33013dcb8a4b57ef62a5669914 --- lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp (.../addheader.jsp) (revision a07430557603483e95a40ae22062e79b68a37778) +++ lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp (.../addheader.jsp) (revision 326782acda142b33013dcb8a4b57ef62a5669914) @@ -39,8 +39,6 @@