Skip to content

AMP-31038: Release v4.0 as 4.5 #4432

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

Open
brianbrix wants to merge 1 commit into
base: future/v4.0
Choose a base branch
from
Open

AMP-31038: Release v4.0 as 4.5 #4432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions amp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.devgateway</groupId>
<artifactId>amp</artifactId>
<version>4.0-SNAPSHOT</version>
<version>4.5</version>
<packaging>war</packaging>
<name>Aid Management Platform</name>
<properties>
Expand Down Expand Up @@ -2227,17 +2227,17 @@
</execution>


<execution>
<id>execute-standalone</id>
<phase>package</phase> <!-- Or specify another appropriate phase -->
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>org.dgfoundation.amp.StandaloneAMPStartup</mainClass>
<classpathScope>runtime</classpathScope>
</configuration>
</execution>
<!-- <execution>-->
<!-- <id>execute-standalone</id>-->
<!-- <phase>package</phase> &lt;!&ndash; Or specify another appropriate phase &ndash;&gt;-->
<!-- <goals>-->
<!-- <goal>java</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <mainClass>org.dgfoundation.amp.StandaloneAMPStartup</mainClass>-->
<!-- <classpathScope>runtime</classpathScope>-->
<!-- </configuration>-->
<!-- </execution>-->

<!-- <execution>-->
<!-- <id>compile-selenium</id>-->
Expand Down
56 changes: 28 additions & 28 deletions amp/src/main/resources/xmlpatches/4.0/AMP-30885-Data-Importer-Menu-Items-v3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,45 @@
<apply>
<script>
<lang delimiter=";" type="postgres">
<!-- insert into amp_menu_entry (id,parent_id,name,title,url,position,flags) values-->
<!-- (nextval('amp_menu_entry_seq'),(select id from amp_menu_entry where name='Tools'),'Data Importer','Data Importer',null,9,null);-->
<!-- INSERT INTO amp_menu_entry_view(menu_id, view_type)-->
<!-- VALUES ((SELECT id FROM amp_menu_entry WHERE name = 'Data Importer'), 2);-->
<!-- INSERT INTO amp_visibility_rule(SELECT nextval('amp_visibility_rule_seq'), null, 1);-->
<!-- UPDATE amp_menu_entry_view SET rule_id=(SELECT currval('amp_visibility_rule_seq')) WHERE menu_id= (SELECT id FROM amp_menu_entry WHERE name = 'Data Importer') AND view_type=2;-->
insert into amp_menu_entry (id,parent_id,name,title,url,position,flags) values
(nextval('amp_menu_entry_seq'),(select id from amp_menu_entry where name='Tools'),'Data Importer','Data Importer',null,9,null);
INSERT INTO amp_menu_entry_view(menu_id, view_type)
VALUES ((SELECT id FROM amp_menu_entry WHERE name = 'Data Importer'), 2);
INSERT INTO amp_visibility_rule(SELECT nextval('amp_visibility_rule_seq'), null, 1);
UPDATE amp_menu_entry_view SET rule_id=(SELECT currval('amp_visibility_rule_seq')) WHERE menu_id= (SELECT id FROM amp_menu_entry WHERE name = 'Data Importer') AND view_type=2;


<!-- INSERT INTO amp_features_visibility (id,name,haslevel,parent)-->
<!-- SELECT (select nextval('amp_features_visibility_seq')),'Data Importer',true,-->
<!-- (SELECT id FROM amp_modules_visibility WHERE name = 'Tools')-->
<!-- WHERE-->
<!-- NOT EXISTS (SELECT id from amp_features_visibility WHERE name = 'Data Importer');-->
INSERT INTO amp_features_visibility (id,name,haslevel,parent)
SELECT (select nextval('amp_features_visibility_seq')),'Data Importer',true,
(SELECT id FROM amp_modules_visibility WHERE name = 'Tools')
WHERE
NOT EXISTS (SELECT id from amp_features_visibility WHERE name = 'Data Importer');


<!-- INSERT INTO amp_visibility_rule_amp_features_visibility(select currval('amp_visibility_rule_seq'),-->
<!-- (SELECT id FROM amp_features_visibility WHERE name = 'Data Importer'-->
<!-- AND parent IN (SELECT id FROM amp_modules_visibility WHERE name = 'Tools')));-->
INSERT INTO amp_visibility_rule_amp_features_visibility(select currval('amp_visibility_rule_seq'),
(SELECT id FROM amp_features_visibility WHERE name = 'Data Importer'
AND parent IN (SELECT id FROM amp_modules_visibility WHERE name = 'Tools')));


<!-- &lt;!&ndash; Import Data&ndash;&gt;-->
<!-- Import Data-->

<!-- insert into amp_menu_entry (id,parent_id,name,title,url,position,flags) values-->
<!-- (nextval('amp_menu_entry_seq'),(select id from amp_menu_entry where name='Data Importer'),'Import Data','Import Data','/aim/dataImporter.do',1,null);-->
<!-- INSERT INTO amp_menu_entry_view(menu_id, view_type)-->
<!-- VALUES ((SELECT id FROM amp_menu_entry WHERE name = 'Import Data'), 2);-->
<!-- INSERT INTO amp_visibility_rule(SELECT nextval('amp_visibility_rule_seq'), null, 1);-->
<!-- UPDATE amp_menu_entry_view SET rule_id=(SELECT currval('amp_visibility_rule_seq')) WHERE menu_id= (SELECT id FROM amp_menu_entry WHERE name = 'Import Data') AND view_type=2;-->
insert into amp_menu_entry (id,parent_id,name,title,url,position,flags) values
(nextval('amp_menu_entry_seq'),(select id from amp_menu_entry where name='Data Importer'),'Import Data','Import Data','/aim/dataImporter.do',1,null);
INSERT INTO amp_menu_entry_view(menu_id, view_type)
VALUES ((SELECT id FROM amp_menu_entry WHERE name = 'Import Data'), 2);
INSERT INTO amp_visibility_rule(SELECT nextval('amp_visibility_rule_seq'), null, 1);
UPDATE amp_menu_entry_view SET rule_id=(SELECT currval('amp_visibility_rule_seq')) WHERE menu_id= (SELECT id FROM amp_menu_entry WHERE name = 'Import Data') AND view_type=2;



<!-- &lt;!&ndash; Import Progress&ndash;&gt;-->
<!-- Import Progress-->

<!-- insert into amp_menu_entry (id,parent_id,name,title,url,position,flags) values-->
<!-- (nextval('amp_menu_entry_seq'),(select id from amp_menu_entry where name='Data Importer'),'View Progress','View Progress','/aim/viewImportProgress.do',2,null);-->
<!-- INSERT INTO amp_menu_entry_view(menu_id, view_type)-->
<!-- VALUES ((SELECT id FROM amp_menu_entry WHERE name = 'View Progress'), 2);-->
<!-- INSERT INTO amp_visibility_rule(SELECT nextval('amp_visibility_rule_seq'), null, 1);-->
<!-- UPDATE amp_menu_entry_view SET rule_id=(SELECT currval('amp_visibility_rule_seq')) WHERE menu_id= (SELECT id FROM amp_menu_entry WHERE name = 'View Progress') AND view_type=2;-->
insert into amp_menu_entry (id,parent_id,name,title,url,position,flags) values
(nextval('amp_menu_entry_seq'),(select id from amp_menu_entry where name='Data Importer'),'View Progress','View Progress','/aim/viewImportProgress.do',2,null);
INSERT INTO amp_menu_entry_view(menu_id, view_type)
VALUES ((SELECT id FROM amp_menu_entry WHERE name = 'View Progress'), 2);
INSERT INTO amp_visibility_rule(SELECT nextval('amp_visibility_rule_seq'), null, 1);
UPDATE amp_menu_entry_view SET rule_id=(SELECT currval('amp_visibility_rule_seq')) WHERE menu_id= (SELECT id FROM amp_menu_entry WHERE name = 'View Progress') AND view_type=2;


</lang>
Expand Down
6 changes: 3 additions & 3 deletions amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%@ taglib uri="/taglib/jstl-core" prefix="c" %>
<%@ taglib prefix="html" uri="/taglib/struts-html" %>
<%@ taglib prefix="bean" uri="/taglib/struts-bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html" %>
<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean" %>
<%@ taglib prefix="logic" uri="http://struts.apache.org/tags-logic" %>
<html:html>
<head>
Expand Down
6 changes: 3 additions & 3 deletions amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%@ taglib uri="/taglib/jstl-core" prefix="c" %>
<%@ taglib prefix="html" uri="/taglib/struts-html" %>
<%@ taglib prefix="bean" uri="/taglib/struts-bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html" %>
<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean" %>
<%@ taglib prefix="logic" uri="http://struts.apache.org/tags-logic" %>
<html:html>
<head>
Expand Down