Author: tchemit Date: 2011-12-13 18:21:48 +0100 (Tue, 13 Dec 2011) New Revision: 183 Url: http://forge.codelutin.com/repositories/revision/echobase/183 Log: fix conflict with id property Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 17:21:22 UTC (rev 182) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 17:21:48 UTC (rev 183) @@ -255,6 +255,11 @@ formatter='formatEntityLabel' sortable="true"/> </s:if> + <s:elseif test="#meta.name == 'id'"> + <sjg:gridColumn name="ID" + title="id" + sortable="true" editable="true"/> + </s:elseif> <s:else> <sjg:gridColumn name="%{#meta.name}" title="%{#meta.name}" @@ -287,7 +292,7 @@ <s:hidden key="entityType" label=''/> - <s:hidden id="id" name='id' label=''/> + <s:hidden id="topiaId" name='topiaId' label=''/> <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/>