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

Kleine Korrekturen 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1485 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-02-03 16:59:06 +00:00
parent 9652bb2e65
commit 5d6b8e9b9c
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl
View File

@ -8,7 +8,7 @@ object type PublicPersonalProfile extends ContentPage {
String[0..1] profileUrl = ct_public_personal_profiles.profile_url VARCHAR(256);
String[0..1] position = ct_public_personal_profiles.position VARCHAR(2048);
String[0..1] researchInterests = ct_public_personal_profiles.research_interests CLOB;
String[0..1] interests = ct_public_personal_profiles.interests CLOB;
String[0..1] misc = ct_public_personal_profiles.misc CLOB;
reference key (ct_public_personal_profiles.profile_id);

2
ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.1-6.6.2/add_info_fields.sql
View File

@ -25,7 +25,7 @@ ALTER TABLE ct_public_personal_profiles
ADD COLUMN position VARCHAR(2048);
ALTER TABLE ct_public_personal_profiles
ADD COLUMN research_interests text;
ADD COLUMN interests text;
ALTER TABLE ct_public_personal_profiles
ADD COLUMN misc text;

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

@ -56,7 +56,7 @@ public class PublicPersonalProfile
public static final String PROFILE_URL = "profileUrl";
public static final String LINK_LIST_NAME = "publicPersonalProfileNavItems";
public static final String POSITION = "position";
public static final String RESEARCH_INTERESTS = "researchInterests";
public static final String INTERESTS = "interests";
public static final String MISC = "misc";
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.contenttypes.PublicPersonalProfile";
@ -145,11 +145,11 @@ public class PublicPersonalProfile
}
public String getResearchInterests() {
return (String) get(RESEARCH_INTERESTS);
return (String) get(INTERESTS);
}
public void setResearchInterests(final String researchInterests) {
set(RESEARCH_INTERESTS, researchInterests);
set(INTERESTS, researchInterests);
}
public String getMisc() {

10
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditStep.java → ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditForm.java
View File

@ -20,12 +20,12 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm;
* @author Jens Pelzetter
* @version $Id$
*/
public class PublicPersonalProfileResearchInterestsEditStep
public class PublicPersonalProfileResearchInterestsEditForm
extends BasicItemForm
implements FormProcessListener,
FormInitListener {
public PublicPersonalProfileResearchInterestsEditStep(
public PublicPersonalProfileResearchInterestsEditForm(
final ItemSelectionModel itemModel) {
super("PublicPersonalProfileEditResearchInterests",
itemModel);
@ -37,7 +37,7 @@ public class PublicPersonalProfileResearchInterestsEditStep
"publicpersonalprofile.ui.research_interests")));
final ParameterModel riParam =
new StringParameter(
PublicPersonalProfile.RESEARCH_INTERESTS);
PublicPersonalProfile.INTERESTS);
final TextArea researchInterests = new CMSDHTMLEditor(riParam);
researchInterests.setCols(75);
researchInterests.setRows(16);
@ -52,7 +52,7 @@ public class PublicPersonalProfileResearchInterestsEditStep
(PublicPersonalProfile) getItemSelectionModel().
getSelectedItem(state);
data.put(PublicPersonalProfile.RESEARCH_INTERESTS,
data.put(PublicPersonalProfile.INTERESTS,
profile.getResearchInterests());
setVisible(state, true);
@ -71,7 +71,7 @@ public class PublicPersonalProfileResearchInterestsEditStep
if ((profile != null)
&& getSaveCancelSection().getSaveButton().isSelected(state)) {
profile.setResearchInterests((String) data.get(
PublicPersonalProfile.RESEARCH_INTERESTS));
PublicPersonalProfile.INTERESTS));
profile.save();
}

5
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java
View File

@ -35,7 +35,8 @@ public class PublicPersonalProfileResearchInterestsStep extends SimpleEditStep {
super(itemModel, parent, prefix);
final BasicItemForm editRiForm =
new PublicPersonalProfileMiscEditForm(itemModel);
new PublicPersonalProfileResearchInterestsEditForm
(itemModel);
add(EDIT_RI_SHEET_NAME, (String) PublicPersonalProfileGlobalizationUtil.
globalize("publicpersonalprofile.ui.research_interests.edit").
localize(),
@ -52,7 +53,7 @@ public class PublicPersonalProfileResearchInterestsStep extends SimpleEditStep {
sheet.add(PublicPersonalProfileGlobalizationUtil.globalize(
"publicpersonalprofile.ui.research_interests"),
PublicPersonalProfile.RESEARCH_INTERESTS);
PublicPersonalProfile.INTERESTS);
return sheet;
}