Merge pull request #582 from devgateway/hotfix/v2.12.7.2

AMP 2.12.7.2 Release
devgateway · Dec 23, 2016 · d6a73fa · d6a73fa
2 parents 39f342d + 3392540
commit d6a73fa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/amp/TEMPLATE/ampTemplate/site-config.xml b/amp/TEMPLATE/ampTemplate/site-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE page [
-<!ENTITY ampVersion "2.12.7.1">
-<!ENTITY buildDate "29.11.2016">
+<!ENTITY ampVersion "2.12.7.2">
+<!ENTITY buildDate "15.12.2016">
 ]>
 <site-config>
 	<site-layout>

diff --git a/amp/repository/aim/view/allVisibilityTags.jsp b/amp/repository/aim/view/allVisibilityTags.jsp
@@ -1159,7 +1159,6 @@ deleted 6 fields, do not reinsert
 <field:display name="Mandatory Indicator For Organization Intervention Location" feature="NGO Form"></field:display>
 <field:display name="Mandatory Budget Organization Code" feature="Organization Form"></field:display>
 <field:display name="Mandatory Organization Code" feature="Organization Form"></field:display>
-<field:display name="Enable Organization Edit in Workspace InFo" feature="Organization Form"></field:display>
 
 <!--  -->
 <module:display name="Visualization Dashboards"></module:display>

diff --git a/amp/repository/aim/view/teamSetupMenu.jsp b/amp/repository/aim/view/teamSetupMenu.jsp
@@ -173,22 +173,6 @@ function putLoading(){
 							</digi:link>
 						</li>
 					</c:if>
-					<field:display name="Enable Organization Edit in Workspace InFo" feature="Organization Form">
-					<c:if test="${selectedTab  == '9'}">
-						<li class="desktop_tab ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
-							<a class="tab_link">
-								<digi:trn>Organizations</digi:trn>
-							</a>
-						</li>
-					</c:if>					
-					<c:if test="${selectedTab  != '9'}">
-						<li class="desktop_tab ui-state-default ui-corner-top">
-							<digi:link href="/organisationManager.do" styleClass="tab_link">
-								<digi:trn>Organizations</digi:trn>
-							</digi:link>
-						</li>
-					</c:if>
-					</field:display>
 				</ul>
 
 

diff --git a/amp/xmlpatches/2.z12.08/AMP-24105-removing-field-from-db.xml b/amp/xmlpatches/2.z12.08/AMP-24105-removing-field-from-db.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:patch closeOnSuccess="true" retryOnFail="true"
+    xmlns:tns="http://docs.ampdev.net/schemas/xmlpatcher" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://docs.ampdev.net/schemas/xmlpatcher ../doc/xmlpatcher.xsd ">
+    <jira>AMP-24105</jira>
+    <keyword>remove field Enable Organization Edit in Workspace InFo</keyword>
+    <author>apicca</author>
+    <description>removing field "Enable Organization Edit in Workspace InFo" from db.</description>
+    <apply>
+        <script>
+            <lang delimiter=";" type="postgres">
+				DELETE FROM amp_fields_templates where field IN (SELECT id FROM amp_fields_visibility where name in ('Enable Organization Edit in Workspace InFo'));
+				DELETE FROM amp_fields_visibility WHERE name IN ('Enable Organization Edit in Workspace InFo');
+            </lang>
+        </script>
+    </apply>
+</tns:patch>