Skip to content

RCM-124 - Cohort Builder pages fails with DWR javascript errors #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mseaton merged 3 commits into from
Jul 21, 2026
Merged

RCM-124 - Cohort Builder pages fails with DWR javascript errors #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe7ee49
RCM-124 - Cohort Builder pages fails with DWR javascript errors
mseaton Jul 20, 2026
00fdc0c
RCM-124 - Add config.xml/annotation completeness test, bump min Java …
mseaton Jul 20, 2026
94d27ad
RCM-124 - Update legacyui dependencies
mseaton Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,57 +11,6 @@
<description>API project for Reporting Compatibility</description>

<dependencies>
<!--
Add other dependencies from lib:
<dependency>
<groupId>org.other.library</groupId>
<artifactId>library-name</artifactId>
</dependency>
-->

<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.openmrs.test</groupId>
<artifactId>openmrs-test</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<version>6.0.47</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.simpleframework</groupId>
<artifactId>simple-xml</artifactId>
Expand Down
29 changes: 6 additions & 23 deletions omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,42 +24,25 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<version>${openMRSVersion}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<version>${openMRSVersion}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.openmrs.test</groupId>
<artifactId>openmrs-test</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<version>6.0.47</version>
<scope>provided</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
<version>1.0</version>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
194 changes: 97 additions & 97 deletions ...mpatibility/extension/html/AdminList.java → ...mpatibility/extension/html/AdminList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,97 @@
/**
* The contents of this file are subject to the OpenMRS Public License
* Version 1.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://license.openmrs.org
*
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
*
* Copyright (C) OpenMRS, LLC. All Rights Reserved.
*/
package org.openmrs.module.reportingcompatibility.extension.html;
import java.util.LinkedHashMap;
import java.util.Map;
import org.openmrs.api.context.Context;
import org.openmrs.module.Extension;
import org.openmrs.module.web.extension.AdministrationSectionExt;
/**
* This class defines the links that will appear on the administration page
*
* This extension is enabled by defining (uncommenting) it in the
* /metadata/config.xml file.
*/
public class AdminList extends AdministrationSectionExt {
/**
* @see org.openmrs.module.web.extension.AdministrationSectionExt#getMediaType()
*/
public Extension.MEDIA_TYPE getMediaType() {
return Extension.MEDIA_TYPE.html;
}
/**
* @see AdministrationSectionExt#getRequiredPrivilege()
*/
@Override
public String getRequiredPrivilege() {
return "Run Reports,Manage Reports,View Reports,View Data Exports";
}
/**
* @see org.openmrs.module.web.extension.AdministrationSectionExt#getTitle()
*/
public String getTitle() {
return "reportingcompatibility.Report.header";
}
/**
* @see org.openmrs.module.web.extension.AdministrationSectionExt#getLinks()
*/
public Map<String, String> getLinks() {
Map<String, String> map = new LinkedHashMap<String, String>();
addLink(map, "Run Reports", "/admin/reports/runReport.list", "reportingcompatibility.Report.list.title");
addLink(map, "Manage Reports", "/admin/reports/reportSchemaXml.list", "reportingcompatibility.Report.manage.title");
addLink(map, "Manage Reports", "/admin/reports/reportMacros.form", "reportingcompatibility.Report.macros.title");
addLink(map, "Add Report Objects,Edit Report Objects,Delete Report Objects,View Report Objects",
"/admin/reports/dataExport.list", "reportingcompatibility.DataExport.manage");
addLink(map, "Add Report Objects,Edit Report Objects,Delete Report Objects,View Report Objects",
"/admin/reports/rowPerObsDataExport.list", "reportingcompatibility.RowPerObsDataExport.manage");
addLink(map, "Add Cohorts,Edit Cohorts,Delete Cohorts,View Cohorts", "/admin/reports/cohorts.list", "Cohort.manage");
addLink(map, "Add Patient Searches,Edit Patient Searches,Delete Patient Searches,View Patient Searches",
"/admin/reports/patientSearch.list", "reportingcompatibility.PatientSearch.manage");
addLink(map, "Add Report Objects,Edit Report Objects,Delete Report Objects,View Report Objects",
"/admin/reports/reportObject.list", "reportingcompatibility.ReportObject.manage");
return map;
}
/**
* Private method to add a link to the AdminList if there are sufficient privileges
* @param m
* @param privileges
* @param messageKey
* @param link
*/
private void addLink(Map<String, String> m, String privileges, String link, String messageKey) {
boolean hasPrivilege = false;
if (privileges != null) {
for (String p : privileges.split(",")) {
if (Context.hasPrivilege(p)) {
hasPrivilege = true;
break;
}
}
}
if (hasPrivilege) {
m.put(link, messageKey);
}
}
}
/**
* The contents of this file are subject to the OpenMRS Public License
* Version 1.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://license.openmrs.org
*
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
*
* Copyright (C) OpenMRS, LLC. All Rights Reserved.
*/
package org.openmrs.module.reportingcompatibility.extension.html;

import java.util.LinkedHashMap;
import java.util.Map;

import org.openmrs.api.context.Context;
import org.openmrs.module.Extension;
import org.openmrs.module.web.extension.AdministrationSectionExt;

/**
* This class defines the links that will appear on the administration page
*
* This extension is enabled by defining (uncommenting) it in the
* /metadata/config.xml file.
*/
public class AdminList extends AdministrationSectionExt {

/**
* @see org.openmrs.module.web.extension.AdministrationSectionExt#getMediaType()
*/
public Extension.MEDIA_TYPE getMediaType() {
return Extension.MEDIA_TYPE.html;
}

/**
* @see AdministrationSectionExt#getRequiredPrivilege()
*/
@Override
public String getRequiredPrivilege() {
return "Run Reports,Manage Reports,View Reports,View Data Exports";
}

/**
* @see org.openmrs.module.web.extension.AdministrationSectionExt#getTitle()
*/
public String getTitle() {
return "reportingcompatibility.Report.header";
}

/**
* @see org.openmrs.module.web.extension.AdministrationSectionExt#getLinks()
*/
public Map<String, String> getLinks() {

Map<String, String> map = new LinkedHashMap<String, String>();

addLink(map, "Run Reports", "/admin/reports/runReport.list", "reportingcompatibility.Report.list.title");
addLink(map, "Manage Reports", "/admin/reports/reportSchemaXml.list", "reportingcompatibility.Report.manage.title");
addLink(map, "Manage Reports", "/admin/reports/reportMacros.form", "reportingcompatibility.Report.macros.title");
addLink(map, "Add Report Objects,Edit Report Objects,Delete Report Objects,View Report Objects",
"/admin/reports/dataExport.list", "reportingcompatibility.DataExport.manage");
addLink(map, "Add Report Objects,Edit Report Objects,Delete Report Objects,View Report Objects",
"/admin/reports/rowPerObsDataExport.list", "reportingcompatibility.RowPerObsDataExport.manage");
addLink(map, "Add Cohorts,Edit Cohorts,Delete Cohorts,View Cohorts", "/admin/reports/cohorts.list", "Cohort.manage");
addLink(map, "Add Patient Searches,Edit Patient Searches,Delete Patient Searches,View Patient Searches",
"/admin/reports/patientSearch.list", "reportingcompatibility.PatientSearch.manage");
addLink(map, "Add Report Objects,Edit Report Objects,Delete Report Objects,View Report Objects",
"/admin/reports/reportObject.list", "reportingcompatibility.ReportObject.manage");

return map;
}

/**
* Private method to add a link to the AdminList if there are sufficient privileges
* @param m
* @param privileges
* @param messageKey
* @param link
*/
private void addLink(Map<String, String> m, String privileges, String link, String messageKey) {
boolean hasPrivilege = false;
if (privileges != null) {
for (String p : privileges.split(",")) {
if (Context.hasPrivilege(p)) {
hasPrivilege = true;
break;
}
}
}
if (hasPrivilege) {
m.put(link, messageKey);
}
}
}
Loading