Author: sshyrkov Date: Tue Sep 18 12:40:14 2007 New Revision: 18539 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18539&repname= =3Djahia Log: JAHIA-2275: Jahia Administration - Manage markups filtering - deleting a ma= rkup fails =
http://www.jahia.net/jira/browse/JAHIA-2275 Resolution: delete markup definition properly (using deleteAll for a list) = and before deleting markup set to prevent constraint violation. Proper dial= og titles for Jahia Administration screens are used. Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi= aMarkupDefinitionDAO.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/administrati= on/htmleditors/actions/HtmlEditorsAdminAction.java branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-t= iles-defs.xml branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/administration/commo= n/servermode_admin_header.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da= o/JahiaMarkupDefinitionDAO.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaMarkupDefinitionDAO.java= &rev=3D18539&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi= aMarkupDefinitionDAO.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi= aMarkupDefinitionDAO.java Tue Sep 18 12:40:14 2007 @@ -49,7 +49,7 @@ public void delete(Integer id) { HibernateTemplate template =3D getHibernateTemplate(); template.setFlushMode(HibernateTemplate.FLUSH_AUTO); - template.delete(template.find("from JahiaMarkupdefProp p where p.c= omp_id.idMarkupDefinition=3D?", id)); + template.deleteAll(template.find("from JahiaMarkupdefProp p where = p.comp_id.idMarkupDefinition=3D?", id)); template.deleteAll(template.find("from JahiaMarkupdef def where de= f.id =3D ?", id)); } = Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/admini= stration/htmleditors/actions/HtmlEditorsAdminAction.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/views/administration/htmleditors/actions/Ht= mlEditorsAdminAction.java&rev=3D18539&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/administrati= on/htmleditors/actions/HtmlEditorsAdminAction.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/administrati= on/htmleditors/actions/HtmlEditorsAdminAction.java Tue Sep 18 12:40:14 2007 @@ -244,12 +244,12 @@ final MarkupSetting setting =3D htmlPServ.getMarkupSetting(= id); if ( setting !=3D null ){ try { + htmlPServ.removeMarkupSetting(id); htmlPServ.removeMarkupDefinition(setting.getMarkupD= efId()); } catch ( Throwable t ){ logger.error("Error deleting markup definition :" + setting.getMarkupDefId(),t); } - htmlPServ.removeMarkupSetting(id); } } } Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/j= ahia-tiles-defs.xml URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-tiles-defs.xml&rev=3D18539= &repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-t= iles-defs.xml (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/jahia-t= iles-defs.xml Tue Sep 18 12:40:14 2007 @@ -217,6 +217,7 @@ <definition name=3D"serveradmin.default.layout" path=3D"/views/administra= tion/admin_default_layout.jsp"> = <put name=3D"header" value=3D"/views/administration/common/servermode_= admin_header.jsp"/> <put name=3D"footer" value=3D"/views/administration/common/servermode_= admin_footer.jsp"/> + <put name=3D"dialogTitle" type=3D"string" value=3D"org.jahia.admin.ser= verSettings.label"/> </definition> = <definition name=3D"siteadmin.default.layout" path=3D"/views/administrati= on/admin_default_layout.jsp"> = @@ -227,26 +228,30 @@ <!-- Html editors administration : operation choices view --> <definition name=3D"admin.htmleditors.operation-choices" extends=3D"serve= radmin.default.layout"> = <put name=3D"body-content" value=3D"/views/administration/htmleditors/= operation_choices.jsp"/> + <put name=3D"dialogTitle" type=3D"string" value=3D"org.jahia.admin= .htmleditors.label"/> </definition> = <!-- Html editors administration : display html editors list view --> <definition name=3D"admin.htmleditors.display-htmleditors-list" extends= =3D"serveradmin.default.layout"> = <put name=3D"body-content" value=3D"/views/administration/htmleditors/= htmleditors_config_details.jsp"/> + <put name=3D"dialogTitle" type=3D"string" value=3D"org.jahia.admin= .htmleditors.displayHtmlEditorsList.label"/> </definition> = <!-- Html editors administration : display manage markups to remove view= --> <definition name=3D"admin.htmleditors.manage-markup-to-remove" extends=3D= "serveradmin.default.layout"> = <put name=3D"body-content" value=3D"/views/administration/htmleditors/= htmleditors_manage_markups.jsp"/> + <put name=3D"dialogTitle" type=3D"string" value=3D"org.jahia.admin= .htmleditors.manageMarkupsFiltering.label"/> </definition> = <!-- Html editors administration : display add markup view --> - <definition name=3D"admin.htmleditors.add-markup" extends=3D"serveradmin.= default.layout"> = + <definition name=3D"admin.htmleditors.add-markup" extends=3D"admin.htmled= itors.manage-markup-to-remove"> = <put name=3D"body-content" value=3D"/views/administration/htmleditors/= htmleditors_add_markup.jsp"/> </definition> = <!-- Html editors administration : manage site setting view --> <definition name=3D"admin.htmleditors.manage-site-setting" extends=3D"ser= veradmin.default.layout"> = <put name=3D"body-content" value=3D"/views/administration/htmleditors/= htmleditors_manage_site_setting.jsp"/> + <put name=3D"dialogTitle" type=3D"string" value=3D"org.jahia.admin= .htmleditors.manageSiteSetting.label"/> </definition> = = Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/administration= /common/servermode_admin_header.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/views/administration/common/servermode_admin_header= .jsp&rev=3D18539&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/administration/commo= n/servermode_admin_header.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/administration/commo= n/servermode_admin_header.jsp Tue Sep 18 12:40:14 2007 @@ -8,5 +8,6 @@ <div id=3D"topTitleLogo"> <img src=3D"<%=3DURL%>/images/icons/admin/text_ok.gif" width=3D"48" heig= ht=3D"48" border=3D"0" /> </div> - <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle resourceName=3D"org.= jahia.admin.serverSettings.label"/></h1> + <% String titleKey =3D request.getAttribute("dialogTitle") !=3D null ? r= equest.getAttribute("dialogTitle").toString() : "org.jahia.admin.serverSett= ings.label"; %> + <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle resourceName=3D"<%= =3DtitleKey %>"/></h1> </div> \ No newline at end of file _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
