Changeset 5450
- Timestamp:
- 09/04/08 20:34:09 (3 months ago)
- Files:
-
- openmrs-modules/conceptimportexport/trunk/metadata/config.xml (modified) (1 diff)
- openmrs-modules/conceptimportexport/trunk/metadata/moduleApplicationContext.xml (modified) (2 diffs)
- openmrs-modules/conceptimportexport/trunk/src/org/openmrs/module/conceptimportexport/api/impl/ConceptDictionaryServiceImpl.java (modified) (1 diff)
- openmrs-modules/conceptimportexport/trunk/src/org/openmrs/module/conceptimportexport/extension/html/AdminList.java (modified) (3 diffs)
- openmrs-modules/conceptimportexport/trunk/web/module/conceptimportexportForm.jsp (moved) (moved from openmrs-modules/conceptimportexport/trunk/web/module/conceptportmoduleForm.jsp) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openmrs-modules/conceptimportexport/trunk/metadata/config.xml
r5448 r5450 7 7 <id>conceptimportexport</id> 8 8 <name>Concept Import Export Module</name> 9 <version>1. 0</version>9 <version>1.3.0.1</version> 10 10 <package>org.openmrs.module.@MODULE_ID@</package> 11 11 <author>Andreas Kollegger</author> openmrs-modules/conceptimportexport/trunk/metadata/moduleApplicationContext.xml
r5448 r5450 6 6 <beans> 7 7 8 <bean id="concept portmoduleUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">8 <bean id="conceptimportexportUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"> 9 9 <property name="mappings"> 10 10 <props> 11 <prop key="module/@MODULE_ID@/importexport.form">concept portmoduleFormController</prop>11 <prop key="module/@MODULE_ID@/importexport.form">conceptimportexportFormController</prop> 12 12 </props> 13 13 </property> … … 16 16 <!-- Controllers --> 17 17 18 <bean id="concept portmoduleFormController" class="@MODULE_PACKAGE@.web.controller.ConceptPortModuleFormController">18 <bean id="conceptimportexportFormController" class="@MODULE_PACKAGE@.web.controller.ConceptPortModuleFormController"> 19 19 <property name="dictionaryService"> 20 20 <bean id="conceptDictionary" class="@MODULE_PACKAGE@.api.impl.ConceptDictionaryServiceImpl"/> 21 21 </property> 22 22 <property name="commandName"><value>noCommandForMe</value></property> 23 <property name="formView"><value>/module/@MODULE_ID@/concept portmoduleForm</value></property>23 <property name="formView"><value>/module/@MODULE_ID@/conceptimportexportForm</value></property> 24 24 <property name="successView"><value>importexport.form</value></property> 25 25 </bean> openmrs-modules/conceptimportexport/trunk/src/org/openmrs/module/conceptimportexport/api/impl/ConceptDictionaryServiceImpl.java
r5448 r5450 67 67 importDataMap.put("filename", filename); 68 68 69 Trigger importNow = new SimpleTrigger("import now", "Concept PortModule");69 Trigger importNow = new SimpleTrigger("import now", "ConceptImportExport"); 70 70 71 71 try { openmrs-modules/conceptimportexport/trunk/src/org/openmrs/module/conceptimportexport/extension/html/AdminList.java
r5448 r5450 22 22 /** 23 23 * This class defines the links that will appear on the administration page 24 * under the "concept portmodule.title" heading.24 * under the "conceptimportexport.title" heading. 25 25 * 26 26 * This extension is enabled by defining (uncommenting) it in the … … 40 40 */ 41 41 public String getTitle() { 42 return "concept portmodule.title";42 return "conceptimportexport.title"; 43 43 } 44 44 … … 50 50 Map<String, String> map = new HashMap<String, String>(); 51 51 52 map.put("module/concept portmodule/importexport.form", "conceptportmodule.title");52 map.put("module/conceptimportexport/importexport.form", "conceptimportexport.title"); 53 53 54 54 return map; openmrs-modules/conceptimportexport/trunk/web/module/conceptimportexportForm.jsp
r5448 r5450 6 6 <openmrs:require privilege="View Administration Functions" otherwise="/login.htm" redirect="/admin/index.htm" /> 7 7 8 <h2><spring:message code="concept portmodule.title" /></h2>8 <h2><spring:message code="conceptimportexport.title" /></h2> 9 9 10 10 <br/> 11 11 12 <b class="boxHeader"><spring:message code="concept portmodule.importArea" /></b>12 <b class="boxHeader"><spring:message code="conceptimportexport.importArea" /></b> 13 13 <div class="box"> 14 14 <form id="dictionaryImportForm" action="importexport.form" method="post" enctype="multipart/form-data"> 15 <spring:message code="concept portmodule.importDictionaryArchive"/>:15 <spring:message code="conceptimportexport.importDictionaryArchive"/>: 16 16 <input type="file" name="dictionaryFile" size="40" /> 17 17 <input type="hidden" name="action" value="import"/> … … 19 19 <div id="dictionaryImportButton" style="margin-top: 5px;"> 20 20 <c:choose> 21 <input type="submit" value='<spring:message code="concept portmodule.import"/>'/>21 <input type="submit" value='<spring:message code="conceptimportexport.import"/>'/> 22 22 </c:choose> 23 23 </div> … … 26 26 27 27 <br/> 28 <b class="boxHeader"><spring:message code="concept portmodule.exportArea" /></b>28 <b class="boxHeader"><spring:message code="conceptimportexport.exportArea" /></b> 29 29 <div class="box"> 30 <form id="dictionaryExportForm" action="<%= request.getContextPath() %>/moduleServlet/concept portmodule/exportDictionaryServlet" method="post">31 <spring:message code="concept portmodule.exportDictionaryArchive"/>:30 <form id="dictionaryExportForm" action="<%= request.getContextPath() %>/moduleServlet/conceptimportexport/exportDictionaryServlet" method="post"> 31 <spring:message code="conceptimportexport.exportDictionaryArchive"/>: 32 32 <input type="hidden" name="action" value="export"/> 33 33 34 34 <div id="dictionaryExportButton" style="margin-top: 5px;"> 35 35 <c:choose> 36 <input type="submit" value='<spring:message code="concept portmodule.export"/>'/>36 <input type="submit" value='<spring:message code="conceptimportexport.export"/>'/> 37 37 </c:choose> 38 38 </div> … … 42 42 <br/> 43 43 44 <b class="boxHeader"><spring:message code="concept portmodule.help" /></b>44 <b class="boxHeader"><spring:message code="conceptimportexport.help" /></b> 45 45 <div class="box"> 46 46 <ul> 47 <li><i><spring:message code="concept portmodule.help.import"/></i>48 <li><i><spring:message code="concept portmodule.help.export"/></i>47 <li><i><spring:message code="conceptimportexport.help.import"/></i> 48 <li><i><spring:message code="conceptimportexport.help.export"/></i> 49 49 </ul> 50 50 </div>