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

Anlegen von Rollen für Organistationen funktioniert jetzt. Die Tabelle benötigt noch ein wenig Feinschliff. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@193 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2009-06-12 08:26:03 +00:00
parent d44f00ff43
commit 2b282dcdd8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
View File

@ -62,12 +62,12 @@ data operation swapOrganizationRoleWithNextInGroup {
} }
query allRoleOrderForOrganization { query allRoleOrderForOrganization {
Integer linkOrder; Integer roleOrder;
do { do {
select r.role_order from ct_organizationroles r where r.owner_id = :ownerID select r.role_order from ct_organizationroles r where r.owner_id = :ownerID
} }
map { map {
linkOrder = r.linkOrder; roleOrder = r.role_order;
} }
} }

8
ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationRole.java
View File

@ -197,8 +197,8 @@ public class OrganizationRole extends ACSObject {
} }
DataOperation operation = getSwapOperation(operationName); DataOperation operation = getSwapOperation(operationName);
operation.setParameter("linkOrder", new Integer(key)); operation.setParameter("roleOrder", new Integer(key));
operation.setParameter("nextLinkOrder", new Integer(otherKey)); operation.setParameter("nextRoleOrder", new Integer(otherKey));
operation.execute(); operation.execute();
} }
@ -222,9 +222,9 @@ public class OrganizationRole extends ACSObject {
return 0; return 0;
} }
int returnOrder = 0; int returnOrder = 0;
DataQuery query = SessionManager.getSession().retrieveQuery("com.arsdigita.cms.contenttypes.allRoleOrderForItem"); DataQuery query = SessionManager.getSession().retrieveQuery("com.arsdigita.cms.contenttypes.allRoleOrderForOrganization");
query.setParameter("ownerID", getRoleOwner().getID()); query.setParameter("ownerID", getRoleOwner().getID());
query.addOrder("linkOrder DESC"); query.addOrder("roleOrder DESC");
if (query.next()) { if (query.next()) {
Integer roleOrder = ((Integer) query.get("roleOrder")); Integer roleOrder = ((Integer) query.get("roleOrder"));
query.close(); query.close();

2
ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRolePropertyForm.java
View File

@ -20,7 +20,6 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.util.GlobalizationUtil; import com.arsdigita.bebop.util.GlobalizationUtil;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Article;
import com.arsdigita.cms.contenttypes.GenericOrganization; import com.arsdigita.cms.contenttypes.GenericOrganization;
import com.arsdigita.cms.contenttypes.OrganizationRole; import com.arsdigita.cms.contenttypes.OrganizationRole;
import com.arsdigita.cms.contenttypes.Person; import com.arsdigita.cms.contenttypes.Person;
@ -127,6 +126,7 @@ public class OrganizationRolePropertyForm extends FormSection implements FormIni
GenericOrganization orga = this.getOrganization(s); GenericOrganization orga = this.getOrganization(s);
Assert.exists(orga); Assert.exists(orga);
OrganizationRole role = new OrganizationRole(); OrganizationRole role = new OrganizationRole();
role.setRoleOwner(orga);
return role; return role;
} }

2
ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRoleTable.java
View File

@ -4,7 +4,6 @@ import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.ControlLink; import com.arsdigita.bebop.ControlLink;
import com.arsdigita.bebop.ExternalLink; import com.arsdigita.bebop.ExternalLink;
import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.bebop.Table; import com.arsdigita.bebop.Table;
@ -70,6 +69,7 @@ public class OrganizationRoleTable extends Table {
addTableActionListener(new OrganizationRoleTableActionListener()); addTableActionListener(new OrganizationRoleTableActionListener());
setRowSelectionModel(m_roleModel); setRowSelectionModel(m_roleModel);
setDefaultCellRenderer(new OrganizationRoleTableRenderer()); setDefaultCellRenderer(new OrganizationRoleTableRenderer());
setModelBuilder(new OrganizationRoleTableModelBuilder(itemModel));
} }
protected void addColumns() { protected void addColumns() {