gCubeSystem
/
workspace
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed ticket https://support.social.isti.cnr.it/ticket/87 

Search by Name is now free-text

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@95548 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-05-12 09:58:39 +00:00
parent 26dccc8240
commit 19961ae2b1
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/workspace-6.6.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/workspace-6.6.4-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -25,5 +25,5 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/workspace-6.6.3-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/workspace-6.6.4-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -3,6 +3,6 @@
>>>>>>>=.r93212
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace-TRUNK/target/workspace-6.6.3-SNAPSHOT
lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace-TRUNK/target/workspace-6.6.4-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

2
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -1500,7 +1500,7 @@ public class AppController implements SubscriberInterface {
if(type.equals(ViewSwitchType.Tree) || type.equals(ViewSwitchType.SmartFolder)){
wsPortlet.getGxtCardLayoutResultPanel().setActivePanel(ViewSwitchTypeInResult.Group);
wsPortlet.getSearchAndFilterContainer().setEmptyText(ConstantsPortlet.SEARCHINWORSPACE);
wsPortlet.getSearchAndFilterContainer().setEmptyText(ConstantsPortlet.SEARCHBYNAME);
}
else{
wsPortlet.getGxtCardLayoutResultPanel().setActivePanel(ViewSwitchTypeInResult.Messages);

2
src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java
View File

@ -45,7 +45,7 @@ public class ConstantsPortlet {
public static final String SEARCH = "Search";
public static final String SAVE = "Save";
public static final String CANCEL = "Cancel";
public static final String SEARCHINWORSPACE = "Search in workspace";
public static final String SEARCHBYNAME = "Search by Name";
public static final String SEARCHINMESSAGE = "Search in messages";
public static final String VIEWSPACE = "";//"Filter by Space";
public static final String PREVIEW = "Preview";

4
src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java
View File

@ -89,12 +89,14 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
seVisibleButtonsCancelSave(false);
textSearch.setAllowBlank(true);
textSearch.setEmptyText(ConstantsPortlet.SEARCHINWORSPACE);
textSearch.setEmptyText(ConstantsPortlet.SEARCHBYNAME);
textSearch.setWidth(325);
/* COMMENTED TO FIX https://support.social.isti.cnr.it/ticket/87
textSearch.setRegex("^[a-zA-Z0-9]+[ a-zA-Z0-9_().-]*"); //alphanumeric
textSearch.getMessages().setRegexText(ConstantsExplorer.MESSAGE_SEARCH_FORCE_APHANUMERIC);
textSearch.setAutoValidate(true);
*/
hp.add(textSearch);
bSearch.setStyleName("wizardButton");