updated from main

zms-publishing · Oct 3, 2024 · 751c442 · 751c442
1 parent c7f92a1
commit 751c442
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt b/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
@@ -127,8 +127,8 @@
 			</div>
 			<a tal:condition="python:metaObj.get('acquired',None)" class="btn btn-secondary" target="_blank"
 				tal:attributes="
-					href python:'%s/metaobj_manager/manage_main?lang=%s&id=%s'%(context.getRootElement().absolute_url(),request['lang'],metaObj['id']);
-					title python:'acquired YYY from: %s (%s)'%(context.getRootElement().getHome().id, context.getRootElement().attr('titlealt'))"
+					href python:'%s/metaobj_manager/manage_main?lang=%s&id=%s'%(context.getHome().aq_parent.content.absolute_url(),request['lang'],metaObj['id']);
+					title python:'acquired from: %s (%s)'%(context.getHome().aq_parent.content.id, context.getHome().aq_parent.content.attr('titlealt'))"
 				><i class="fas fa-share" title="acquired"></i></a>
 			<a class="btn btn-secondary" target="_blank" value="BTN_SEARCH"
 				tal:attributes="

diff --git a/Products/zms/zpt/ZMSObject/input_fields.zpt b/Products/zms/zpt/ZMSObject/input_fields.zpt
@@ -216,7 +216,7 @@
 						<button type="submit" name="btn" class="btn btn-secondary" 
 							tal:attributes="value python:'BTN_%s'%command.upper()" 
 							tal:content="python:here.getZMILangStr('BTN_%s'%command.upper())">
-							Action
+							Command
 						</button>
 						<button type="submit" name="btn" class="btn btn-secondary" 
 							value="BTN_CANCEL" 

diff --git a/Products/zms/zpt/ZMSRecordSet/grid.zpt b/Products/zms/zpt/ZMSRecordSet/grid.zpt
@@ -7,6 +7,7 @@
 		metaObjIds python:here.getMetaobjIds();
 		metaObjAttrIds python:here.getMetaobjAttrIds(metaObj['id']);
 		metaObjAttrs python:metaObj['attrs'][1:];
+		metaObjAttrs python:[x for x in metaObjAttrs if x.get('custom', 0) == 1];
 		num_rows python:here.attr('_num_rows');
 		command python:'Save';
 		dummy0 python:standard.once('zmiGraphicExtEdit',request);
@@ -152,10 +153,11 @@
 			<div class="card-body">
 				<div class="form-group row">
 					<div class="controls save">
-						<button type="submit" name="btn" class="btn btn-secondary" 
+						<button type="submit" name="btn" class="btn btn-secondary"
+							tal:condition="python:here.getPrimaryLanguage()==request.get('lang')"
 							tal:attributes="value python:'BTN_%s'%command.upper()" 
 							tal:content="python:here.getZMILangStr('BTN_%s'%command.upper())">
-							Action
+							Command
 						</button>
 						<button type="submit" name="btn" class="btn btn-secondary" 
 							value="BTN_CANCEL" 

diff --git a/Products/zms/zpt/ZMSSqlDb/input_form.zpt b/Products/zms/zpt/ZMSSqlDb/input_form.zpt
@@ -232,7 +232,7 @@
 						tal:content="python:here.getZMILangStr('BTN_CANCEL')">
 						Cancel
 					</button>
-				</div
+				</div>
 			</div><!-- .form-group -->
 
 		</div><!-- card-body -->

diff --git a/Products/zms/zpt/common/zmi_manage_tabs_message.zpt b/Products/zms/zpt/common/zmi_manage_tabs_message.zpt
@@ -10,6 +10,24 @@
 		<tal:block tal:define="dummy0 python:request.set('manage_tabs_message','')"></tal:block>
 		<tal:block tal:define="dummy0 python:standard.set_session_value(here,'manage_tabs_message','')"></tal:block>
 	</div>
+	<div class="alert alert-warning"
+		tal:define="msg python:standard.get_session_value(here,'manage_tabs_warning_message','') or request.get('manage_tabs_warning_message','')"
+		tal:condition="python:msg!=''">
+		<a class="close" data-dismiss="alert" href="#">&times;</a>
+		<tal:block tal:content="structure msg">manage_tabs_warning_message</tal:block>
+		(<tal:block tal:content="structure python:here.getLangFmtDate(here.ZopeTime())">ZopeTime</tal:block>)
+		<tal:block tal:define="dummy0 python:request.set('manage_tabs_warning_message','');"></tal:block>
+		<tal:block tal:define="dummy0 python:standard.set_session_value(here,'manage_tabs_warning_message','')"></tal:block>
+	</div>
+	<div class="alert alert-danger"
+		tal:define="msg python:standard.get_session_value(here,'manage_tabs_danger_message','') or request.get('manage_tabs_danger_message','')"
+		tal:condition="python:msg!=''">
+		<a class="close" data-dismiss="alert" href="#">&times;</a>
+		<tal:block tal:content="structure msg">manage_tabs_danger_message</tal:block>
+		(<tal:block tal:content="structure python:here.getLangFmtDate(here.ZopeTime())">ZopeTime</tal:block>)
+		<tal:block tal:define="dummy0 python:request.set('manage_tabs_danger_message','');"></tal:block>
+		<tal:block tal:define="dummy0 python:standard.set_session_value(here,'manage_tabs_danger_message','')"></tal:block>
+	</div>
 	<div class="alert alert-danger" tal:condition="python:request.get('manage_tabs_error_message')">
 		<a class="close" data-dismiss="alert" href="javascript:;">&times;</a>
 		<tal:block tal:content="structure python:request.get('manage_tabs_error_message')">manage_tabs_error_message</tal:block>