Author: dward
Date: 2007-10-30 22:26:15 +0100 (Tue, 30 Oct 2007)
New Revision: 5579
Added:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/AssetDocumentWithOwnerName.java
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ContributorColumn.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneQuery.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
Log:
- CURRIKI-1063
- GWT Search tool now displays first and last name instead of login name
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ContributorColumn.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ContributorColumn.java
2007-10-30 19:50:38 UTC (rev 5578)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ContributorColumn.java
2007-10-30 21:26:15 UTC (rev 5579)
@@ -25,8 +25,9 @@
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Widget;
import com.xpn.xwiki.gwt.api.client.Document;
+import org.curriki.gwt.client.Constants;
import org.curriki.gwt.client.Main;
-import org.curriki.gwt.client.Constants;
+import org.curriki.gwt.client.search.queries.AssetDocumentWithOwnerName;
public class ContributorColumn extends ResultsColumn
{
@@ -47,7 +48,14 @@
public String getDisplayString(Document value)
{
String creator = "";
- if (value.getCreator() != null){
+ if (value instanceof AssetDocumentWithOwnerName){
+ AssetDocumentWithOwnerName docWithName =
((AssetDocumentWithOwnerName) value);
+ if (docWithName.getOwner_name() != null){
+ creator = docWithName.getOwner_name();
+ } else {
+ creator = docWithName.getCreator();
+ }
+ } else if (value.getCreator() != null){
creator = value.getCreator();
}
return creator;
@@ -56,15 +64,19 @@
public Widget getDisplayWidget(Document value)
{
HTML nameCol = new HTML();
- String name = getDisplayString(value);
- if (name.length() > 0){
- name = name.replaceFirst("XWiki.", "");
- String url = Constants.USER_URL_PREFIX+name;
+ String creatorName = getDisplayString(value);
+ String creator = "";
+ if (value.getCreator() != null){
+ creator = value.getCreator();
+ }
+ if (creator.length() > 0){
+ creator = creator.replaceFirst("XWiki.", "");
+ String url = Constants.USER_URL_PREFIX+creator;
String target = "";
if (useNewWindow){
target = " target=\"AssetContributor\" ";
}
- nameCol.setHTML("<a href=\""+url+"\""+target+">"+name+"</a>");
+ nameCol.setHTML("<a
href=\""+url+"\""+target+">"+creatorName+"</a>");
}
return nameCol;
Added:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/AssetDocumentWithOwnerName.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/AssetDocumentWithOwnerName.java
(rev 0)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/AssetDocumentWithOwnerName.java
2007-10-30 21:26:15 UTC (rev 5579)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007, The Global Education and Learning Community,
+ * and individual contributors as indicated by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author dward
+ *
+ */
+package org.curriki.gwt.client.search.queries;
+
+import org.curriki.gwt.client.AssetDocument;
+
+public class AssetDocumentWithOwnerName extends AssetDocument
+{
+ protected String owner_name;
+
+ public String getOwner_name()
+ {
+ return owner_name;
+ }
+
+ public void setOwner_name(String owner_name)
+ {
+ this.owner_name = owner_name;
+ }
+}
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneQuery.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneQuery.java
2007-10-30 19:50:38 UTC (rev 5578)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneQuery.java
2007-10-30 21:26:15 UTC (rev 5579)
@@ -22,7 +22,6 @@
*/
package org.curriki.gwt.client.search.queries;
-import com.xpn.xwiki.gwt.api.client.Document;
import org.curriki.gwt.client.Constants;
import org.curriki.gwt.client.CurrikiAsyncCallback;
import org.curriki.gwt.client.CurrikiService;
@@ -115,8 +114,7 @@
}
}
- public void onSuccess(Object
- object) {
+ public void onSuccess(Object object) {
super.onSuccess(object);
List resultSet = new Vector();
@@ -127,7 +125,7 @@
setHitcount(((Integer) i.next()).intValue());
while (i.hasNext()){
- Document item = (Document) i.next();
+ AssetDocumentWithOwnerName item = (AssetDocumentWithOwnerName)
i.next();
resultSet.add(item);
}
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
2007-10-30 19:50:38 UTC (rev 5578)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
2007-10-30 21:26:15 UTC (rev 5579)
@@ -50,6 +50,7 @@
import org.curriki.gwt.client.Constants;
import org.curriki.gwt.client.CurrikiService;
import org.curriki.gwt.client.TreeListItem;
+import org.curriki.gwt.client.search.queries.AssetDocumentWithOwnerName;
import org.curriki.gwt.client.widgets.browseasset.AssetItem;
import org.curriki.gwt.client.widgets.template.TemplateInfo;
import org.curriki.xwiki.plugin.asset.Asset;
@@ -1529,10 +1530,13 @@
XWikiDocument cdoc = context.getDoc();
try {
context.setDoc(xdoc);
- if(xdoc.getObject(Constants.ASSET_CLASS) != null)
- doc = new AssetDocument();
- else if (doc == null)
+ if(xdoc.getObject(Constants.ASSET_CLASS) != null) {
+ if (doc == null || !(doc instanceof AssetDocument)) {
+ doc = new AssetDocument();
+ }
+ } else if (doc == null) {
doc = new Document();
+ }
super.newDocument(doc, xdoc, withObjects, withViewDisplayers,
withEditDisplayers, withRenderedContent, context);
BaseObject obj = xdoc.getObject(Constants.ASSET_LICENCE_CLASS);
@@ -1593,10 +1597,9 @@
if (xd == null){
// ignore document as it doesn't seem to exist
} else {
- Document doc = newDocument(new Document(), xd,
true, true, false, false, context);
+ AssetDocumentWithOwnerName doc =
(AssetDocumentWithOwnerName) newDocument(new AssetDocumentWithOwnerName(), xd,
true, true, false, false, context);
- // TODO: We really should create a sub-class of
Document for this
-
//doc.setCreator(context.getWiki().getUserName(xd.getCreator(), null, false,
context));
+
doc.setOwner_name(context.getWiki().getUserName(xd.getCreator(), null, false,
context));
BaseObject obj =
xd.getObject(Constants.COMPOSITEASSET_CLASS);
if (obj != null){
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
