Skip to content
Snippets Groups Projects
Commit 6bdd0710 authored by srosse's avatar srosse
Browse files

OO-990: more fix

parent aa81fc91
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 22 deletions
pom.xml
+ 4
− 4
View file @ 6bdd0710
......@@ -68,9 +68,9 @@
<org.hibernate.version>4.3.5.Final</org.hibernate.version>
<com.sun.jersey.version>1.17.1</com.sun.jersey.version>
<jackson.version>1.9.2</jackson.version>
<org.mysql.version>5.1.29</org.mysql.version>
<org.postgresql.version>9.3-1100-jdbc41</org.postgresql.version>
<org.infinispan.version>6.0.1.Final</org.infinispan.version>
<org.mysql.version>5.1.30</org.mysql.version>
<org.postgresql.version>9.3-1101-jdbc41</org.postgresql.version>
<org.infinispan.version>6.0.2.Final</org.infinispan.version>
<lucene.version>4.8.0</lucene.version>
<!-- properties for testing and Q&A -->
......@@ -2241,7 +2241,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.1.3.Final</version>
<version>1.1.4.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
......
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java
+ 14
− 0
View file @ 6bdd0710
......@@ -146,6 +146,7 @@ public class FileElementImpl extends FormItemImpl implements FileElement, FormIt
VFSLeaf media = new LocalFileImpl(tempUploadFile);
previewEl.setMedia(media, uploadMimeType);
previewEl.setMaxWithAndHeightToFitWithin(300, 200);
previewEl.setVisible(true);
}
// Mark associated component dirty, that it gets rerendered
component.setDirty(true);
......@@ -189,6 +190,16 @@ public class FileElementImpl extends FormItemImpl implements FileElement, FormIt
tempUploadFile.delete();
tempUploadFile = null;
}
if(previewEl != null) {
if(initialFile != null) {
VFSLeaf media = new LocalFileImpl(initialFile);
previewEl.setMedia(media);
previewEl.setMaxWithAndHeightToFitWithin(300, 200);
previewEl.setVisible(true);
} else if(previewEl != null) {
previewEl.setVisible(false);
}
}
uploadFilename = null;
uploadMimeType = null;
}
......@@ -302,6 +313,9 @@ public class FileElementImpl extends FormItemImpl implements FileElement, FormIt
VFSLeaf media = new LocalFileImpl(initialFile);
previewEl.setMedia(media);
previewEl.setMaxWithAndHeightToFitWithin(300, 200);
previewEl.setVisible(true);
} else if(previewEl != null) {
previewEl.setVisible(false);
}
}
......
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
+ 1
− 1
View file @ 6bdd0710
......@@ -82,7 +82,7 @@ public class FileElementRenderer extends DefaultComponentRenderer {
// Read-write view
if (fileComp.isEnabled()) {
ImageFormItem previewCmp = fileElem.getPreviewFormItem();
if(previewCmp != null) {
if(previewCmp != null && previewCmp.isEnabled() && previewCmp.isVisible()) {
sb.append("<div class='o_filepreview'>");
renderer.render(previewCmp.getComponent(), sb, args);
sb.append("</div>");
......
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
+ 15
− 6
View file @ 6bdd0710
......@@ -187,9 +187,15 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
@Override
public void setRendererType(FlexiTableRendererType rendererType) {
// activate active render button
customTypeButton.setActive(FlexiTableRendererType.custom == rendererType);
classicTypeButton.setActive(FlexiTableRendererType.classic == rendererType);
dataTablesTypeButton.setActive(FlexiTableRendererType.dataTables == rendererType);
if(customTypeButton != null) {
customTypeButton.setActive(FlexiTableRendererType.custom == rendererType);
}
if(classicTypeButton != null) {
classicTypeButton.setActive(FlexiTableRendererType.classic == rendererType);
}
if(dataTablesTypeButton != null) {
dataTablesTypeButton.setActive(FlexiTableRendererType.dataTables == rendererType);
}
// update render type
this.rendererType = rendererType;
if(component != null) {
......@@ -202,24 +208,27 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
}
@Override
public void setAvailableRendererTypes(FlexiTableRendererType... rendererType) {
this.availableRendererType = rendererType;
if(rendererType != null && rendererType.length > 1) {
public void setAvailableRendererTypes(FlexiTableRendererType... rendererTypes) {
this.availableRendererType = rendererTypes;
if(rendererTypes != null && rendererTypes.length > 1) {
String dispatchId = component.getDispatchID();
//custom
customTypeButton = new FormLinkImpl(dispatchId + "_customRTypeButton", "rCustomRTypeButton", "", Link.BUTTON + Link.NONTRANSLATED);
customTypeButton.setTranslator(translator);
customTypeButton.setIconLeftCSS("o_icon o_icon_list o_icon-lg");
customTypeButton.setActive(FlexiTableRendererType.custom == rendererType);
components.put("rTypeCustom", customTypeButton);
//classic tables
classicTypeButton = new FormLinkImpl(dispatchId + "_classicRTypeButton", "rClassicRTypeButton", "", Link.BUTTON + Link.NONTRANSLATED);
classicTypeButton.setTranslator(translator);
classicTypeButton.setIconLeftCSS("o_icon o_icon_table o_icon-lg");
classicTypeButton.setActive(FlexiTableRendererType.classic == rendererType);
components.put("rTypeClassic", classicTypeButton);
//jquery tables
dataTablesTypeButton = new FormLinkImpl(dispatchId + "_dataTablesRTypeButton", "rDataTablesRTypeButton", "", Link.BUTTON + Link.NONTRANSLATED);
dataTablesTypeButton.setTranslator(translator);
dataTablesTypeButton.setIconLeftCSS("o_icon o_icon_table o_icon-lg");
dataTablesTypeButton.setActive(FlexiTableRendererType.dataTables == rendererType);
components.put("rTypeDataTables", dataTablesTypeButton);
if(getRootForm() != null) {
......
src/main/java/org/olat/group/ui/main/BGResourcesCellRenderer.java
+ 1
− 1
View file @ 6bdd0710
......@@ -81,7 +81,7 @@ public class BGResourcesCellRenderer implements CustomCellRenderer {
break;
} else {
Link link = LinkFactory.createLink("repo_entry_" + UUID.randomUUID().toString(), container, listeningController);
link.setCustomEnabledLinkCSS("b_small_table_icon o_CourseModule_icon");
link.setIconLeftCSS("o_icon o_CourseModule_icon");
link.setCustomDisplayText(StringHelper.escapeHtml(relation.getDisplayname()));
link.setUserObject(relation);
......
src/main/java/org/olat/repository/manager/RepositoryEntryAuthorViewQueries.java
+ 2
− 2
View file @ 6bdd0710
......@@ -117,7 +117,7 @@ public class RepositoryEntryAuthorViewQueries {
sb.append(" where v.identityKey=:identityKey ");
if(params.getRepoEntryKeys() != null && params.getRepoEntryKeys().size() > 0) {
sb.append(" and v.key=:repoEntryKeys ");
sb.append(" and v.key in (:repoEntryKeys)");
}
if (params.isResourceTypesDefined()) {
......@@ -179,7 +179,7 @@ public class RepositoryEntryAuthorViewQueries {
}
sb.append(")");
}
TypedQuery<T> dbQuery = dbInstance.getCurrentEntityManager()
.createQuery(sb.toString(), type);
if(params.getRepoEntryKeys() != null && params.getRepoEntryKeys().size() > 0) {
......
src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
+ 24
− 7
View file @ 6bdd0710
......@@ -102,7 +102,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
private RichTextElement description, objectives, requirements, credits;
private SingleSelection dateTypesEl, publicDatesEl;
private DateChooser startDateEl, endDateEl;
private FormLink deleteImage;
private FormLink deleteImage, deleteMovie;
private FormSubmit submit;
private FormLayoutContainer descCont, privateDatesCont;
......@@ -190,7 +190,6 @@ public class RepositoryEditDescriptionController extends FormBasicController {
}
language.select(selected, true);
VFSLeaf movie = repositoryService.getIntroductionMovie(repositoryEntry);
RepositoryHandler handler = RepositoryHandlerFactory.getInstance().getRepositoryHandler(repositoryEntry);
mediaContainer = handler.getMediaContainer(repositoryEntry);
if(mediaContainer != null && mediaContainer.getName().equals("media")) {
......@@ -287,7 +286,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
boolean managed = RepositoryEntryManagedFlag.isManaged(repositoryEntry, RepositoryEntryManagedFlag.details);
VFSLeaf img = repositoryManager.getImage(repositoryEntry);
deleteImage = uifactory.addFormLink("delete", "cmd.delete", null, descCont, Link.BUTTON);
deleteImage = uifactory.addFormLink("deleteimg", "cmd.delete", null, descCont, Link.BUTTON);
deleteImage.setVisible(img != null && !managed);
fileUpload = uifactory.addFileElement("rentry.pic", "rentry.pic", descCont);
......@@ -301,6 +300,11 @@ public class RepositoryEditDescriptionController extends FormBasicController {
fileUpload.setVisible(!managed);
fileUpload.limitToMimeType(imageMimeTypes, null, null);
VFSLeaf movie = repositoryService.getIntroductionMovie(repositoryEntry);
deleteMovie = uifactory.addFormLink("deletemovie", "cmd.delete", null, descCont, Link.BUTTON);
deleteMovie.setVisible(movie != null && !managed);
movieUpload = uifactory.addFileElement("rentry.movie", "rentry.movie", descCont);
movieUpload.setMaxUploadSizeKB(movieUploadlimitKB, null, null);
movieUpload.setPreview(ureq.getUserSession(), true);
......@@ -381,18 +385,31 @@ public class RepositoryEditDescriptionController extends FormBasicController {
VFSLeaf img = repositoryManager.getImage(repositoryEntry);
if(fileUpload.getUploadFile() != null) {
fileUpload.reset();
if(img == null) {
deleteImage.setVisible(false);
fileUpload.setLabel("rentry.pic", null);
} else {
deleteImage.setVisible(true);
fileUpload.setLabel(null, null);
}
} else if(img != null) {
repositoryManager.deleteImage(repositoryEntry);
deleteImage.setVisible(false);
fileUpload.setLabel("rentry.pic", null);
fileUpload.setInitialFile(null);
}
flc.setDirty(true);
} else if (source == deleteMovie) {
VFSLeaf movie = repositoryService.getIntroductionMovie(repositoryEntry);
if(movieUpload.getUploadFile() != null) {
movieUpload.reset();
if(movie == null) {
deleteMovie.setVisible(false);
} else {
deleteMovie.setVisible(true);
}
} else if(movie != null) {
movie.delete();
deleteMovie.setVisible(false);
movieUpload.setInitialFile(null);
}
flc.setDirty(true);
......
src/main/java/org/olat/search/SearchService.java
+ 1
− 1
View file @ 6bdd0710
......@@ -40,7 +40,7 @@ import org.olat.core.id.Roles;
*/
public interface SearchService {
public static final Version OO_LUCENE_VERSION = Version.LUCENE_45;
public static final Version OO_LUCENE_VERSION = Version.LUCENE_48;
/**
*
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment