LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verschiedene kleinere Änderungen an PublicPersonalProfile 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2130 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-04-17 07:18:05 +00:00
parent 3e07cb427e
commit bfe6e76882
4 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
View File

@ -180,7 +180,7 @@ public class PublicPersonalProfileXmlUtil {
} }
final ContentItem targetItem = link.getTargetItem(); final ContentItem targetItem = link.getTargetItem();
System.out.printf("targetItem.getClass.getName: %s\n", targetItem.getClass().getName()); //System.out.printf("targetItem.getClass.getName: %s\n", targetItem.getClass().getName());
if ((targetItem instanceof PublicPersonalProfile) if ((targetItem instanceof PublicPersonalProfile)
|| (targetItem instanceof ContentPage)) { || (targetItem instanceof ContentPage)) {
final ContentPage targetPage = (ContentPage) targetItem; final ContentPage targetPage = (ContentPage) targetItem;

20
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java
View File

@ -106,6 +106,7 @@ public class PublicPersonalProfileNavigationTable
return new PublicPersonalProfileNavigationTableModel( return new PublicPersonalProfileNavigationTableModel(
table, state, profile); table, state, profile);
} }
} }
private class PublicPersonalProfileNavigationTableModel private class PublicPersonalProfileNavigationTableModel
@ -150,8 +151,7 @@ public class PublicPersonalProfileNavigationTable
getNegotiatedLocale().getLanguage()); getNegotiatedLocale().getLanguage());
navItems.reset(); navItems.reset();
if ((navItem == null) && (Kernel.getConfig().languageIndependentItems())) { if ((navItem == null) && (Kernel.getConfig().languageIndependentItems())) {
navItem = navItems.getNavItem(key, GlobalizationHelper. navItem = navItems.getNavItem(key, GlobalizationHelper.LANG_INDEPENDENT);
LANG_INDEPENDENT);
} }
navItems.reset(); navItems.reset();
@ -165,10 +165,10 @@ public class PublicPersonalProfileNavigationTable
} }
case 1: case 1:
/*if (navItem.getGeneratorClass() == null) { /*if (navItem.getGeneratorClass() == null) {
return targetItem; return targetItem;
} else { } else {
return null; return null;
}*/ }*/
if (targetItem instanceof PublicPersonalProfile) { if (targetItem instanceof PublicPersonalProfile) {
return null; return null;
} else { } else {
@ -187,6 +187,7 @@ public class PublicPersonalProfileNavigationTable
RelatedLink link = new RelatedLink(linkCollection.getDataObject()); RelatedLink link = new RelatedLink(linkCollection.getDataObject());
return link.getID(); return link.getID();
} }
} }
private class EditCellRenderer private class EditCellRenderer
@ -205,6 +206,7 @@ public class PublicPersonalProfileNavigationTable
return new Label((String) value); return new Label((String) value);
} }
} }
private class TargetCellRenderer private class TargetCellRenderer
@ -232,8 +234,7 @@ public class PublicPersonalProfileNavigationTable
item); item);
if (canEdit) { if (canEdit) {
final ContentSection section = CMS.getContext(). final ContentSection section = item.getContentSection();//CMS.getContext().getContentSection();
getContentSection();
ItemResolver resolver = section.getItemResolver(); ItemResolver resolver = section.getItemResolver();
Link link = new Link(item.getTitle(), Link link = new Link(item.getTitle(),
@ -246,6 +247,7 @@ public class PublicPersonalProfileNavigationTable
} }
} }
} }
} }
private class DeleteCellRenderer private class DeleteCellRenderer
@ -282,6 +284,7 @@ public class PublicPersonalProfileNavigationTable
return label; return label;
} }
} }
} }
@Override @Override
@ -306,4 +309,5 @@ public class PublicPersonalProfileNavigationTable
public void headSelected(TableActionEvent event) { public void headSelected(TableActionEvent event) {
//Nothing to do here. //Nothing to do here.
} }
} }

6
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java
View File

@ -91,7 +91,9 @@ public class PublicPersonalProfilePropertyForm extends BasicPageForm implements
DataCollection persons = SessionManager.getSession().retrieve(personType); DataCollection persons = SessionManager.getSession().retrieve(personType);
//persons.addFilter("profile is null"); //persons.addFilter("profile is null");
persons.addFilter(String.format("version = '%s'", ContentItem.DRAFT)); persons.addFilter(String.format("version = '%s'", ContentItem.DRAFT));
persons.addFilter(String.format("alias.id = '%s'", owner.getID().toString())); if (owner != null) {
persons.addFilter(String.format("alias.id = '%s'", owner.getID().toString()));
}
persons.addOrder("surname asc"); persons.addOrder("surname asc");
persons.addOrder("givenname asc"); persons.addOrder("givenname asc");
persons.addOrder("language asc"); persons.addOrder("language asc");
@ -122,6 +124,7 @@ public class PublicPersonalProfilePropertyForm extends BasicPageForm implements
} }
} }
} }
}); });
} catch (TooManyListenersException ex) { } catch (TooManyListenersException ex) {
throw new UncheckedWrapperException(ex); throw new UncheckedWrapperException(ex);
@ -199,4 +202,5 @@ public class PublicPersonalProfilePropertyForm extends BasicPageForm implements
} }
} }
} }
} }

36
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
View File

@ -213,8 +213,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
} }
if (config.getEmbedded()) { if (config.getEmbedded()) {
final ContentSection section = final ContentSection section = profile.getContentSection();
profile.getContentSection();
final ItemResolver resolver = section.getItemResolver(); final ItemResolver resolver = section.getItemResolver();
String context; String context;
@ -661,12 +660,13 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
if (item instanceof ContentPage) { if (item instanceof ContentPage) {
ContentPage contentPage = ContentPage contentPage =
(ContentPage) item; (ContentPage) item;
logger.error("contentPage.getContentBundle().hasInstance(GlobalizationHelper.getNegotiatedLocale().getLanguage()) = " logger.
+ contentPage. error("contentPage.getContentBundle().hasInstance(GlobalizationHelper.getNegotiatedLocale().getLanguage()) = "
getContentBundle(). + contentPage.
hasInstance(GlobalizationHelper. getContentBundle().
getNegotiatedLocale(). hasInstance(GlobalizationHelper.
getLanguage())); getNegotiatedLocale().
getLanguage()));
if (contentPage.getContentBundle(). if (contentPage.getContentBundle().
hasInstance(GlobalizationHelper. hasInstance(GlobalizationHelper.
getNegotiatedLocale(). getNegotiatedLocale().
@ -680,7 +680,8 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
item = (ContentItem) contentPage; item = (ContentItem) contentPage;
} else { } else {
logger.error( logger.error(
String.format( String.
format(
"Item '%s' not found in a suitable language variant. Negotiated langauge: %s, langugage independent items allowed is %s, language independent code is %s ", "Item '%s' not found in a suitable language variant. Negotiated langauge: %s, langugage independent items allowed is %s, language independent code is %s ",
itemPath, itemPath,
GlobalizationHelper. GlobalizationHelper.
@ -723,10 +724,11 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
if (item instanceof ContentPage) { if (item instanceof ContentPage) {
ContentPage contentPage = (ContentPage) item; ContentPage contentPage = (ContentPage) item;
logger.error("contentPage.getContentBundle().hasInstance(GlobalizationHelper.getNegotiatedLocale().getLanguage()) = " logger.
+ contentPage.getContentBundle(). error("contentPage.getContentBundle().hasInstance(GlobalizationHelper.getNegotiatedLocale().getLanguage()) = "
hasInstance(GlobalizationHelper. + contentPage.getContentBundle().
getNegotiatedLocale().getLanguage())); hasInstance(GlobalizationHelper.
getNegotiatedLocale().getLanguage()));
if (contentPage.getContentBundle(). if (contentPage.getContentBundle().
hasInstance(GlobalizationHelper. hasInstance(GlobalizationHelper.
getNegotiatedLocale().getLanguage())) { getNegotiatedLocale().getLanguage())) {
@ -737,7 +739,8 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
item = (ContentItem) contentPage; item = (ContentItem) contentPage;
} else { } else {
logger.error( logger.error(
String.format( String.
format(
"Item '%s' not found in a suitable language variant. Negotiated langauge: %s, langugage independent items allowed is %s, language independent code is %s ", "Item '%s' not found in a suitable language variant. Negotiated langauge: %s, langugage independent items allowed is %s, language independent code is %s ",
itemPath, itemPath,
GlobalizationHelper. GlobalizationHelper.
@ -1179,10 +1182,10 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
final Filter versionFilter; final Filter versionFilter;
if (preview) { if (preview) {
versionFilter = filterFactory.simple(String.format("version = '%s'", versionFilter = filterFactory.simple(String.format("version = '%s'",
ContentItem.DRAFT)); ContentItem.DRAFT));
} else { } else {
versionFilter = filterFactory.simple(String.format("version = '%s'", versionFilter = filterFactory.simple(String.format("version = '%s'",
ContentItem.LIVE)); ContentItem.LIVE));
} }
final Filter langFilter = filterFactory.simple(String.format( final Filter langFilter = filterFactory.simple(String.format(
@ -1345,5 +1348,6 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
public String getItemPath() { public String getItemPath() {
return itemPath; return itemPath;
} }
} }
} }