[Fmsystem-commits] [17271] fix bug in entity admin

[sigurdne]

Revision: 17271
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17271
Author:   sigurdne
Date:     2017-11-04 07:01:45 -0400 (Sat, 04 Nov 2017)
Log Message:
-----------
fix bug in entity admin

Modified Paths:
--------------
    trunk/property/inc/class.uiadmin_entity.inc.php
    trunk/property/js/portico/admin_entity.edit_category.js
    trunk/property/templates/base/admin_entity.xsl

Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php     2017-11-03 17:54:03 UTC 
(rev 17270)
+++ trunk/property/inc/class.uiadmin_entity.inc.php     2017-11-04 11:01:45 UTC 
(rev 17271)
@@ -659,6 +659,7 @@
                                        }
                                }
 
+                               $msgbox_data = 
$this->bocommon->msgbox_data($this->receipt);
                                $message = 
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
                                
phpgwapi_cache::message_set($message[0]['msgbox_text'], 'message');
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'property.uiadmin_entity.edit',
@@ -818,6 +819,7 @@
                                        }
                                }
 
+                               $msgbox_data = 
$this->bocommon->msgbox_data($this->receipt);
                                $message = 
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
 
                                
phpgwapi_cache::message_set($message[0]['msgbox_text'], 'message');

Modified: trunk/property/js/portico/admin_entity.edit_category.js
===================================================================
--- trunk/property/js/portico/admin_entity.edit_category.js     2017-11-03 
17:54:03 UTC (rev 17270)
+++ trunk/property/js/portico/admin_entity.edit_category.js     2017-11-04 
11:01:45 UTC (rev 17271)
@@ -35,11 +35,9 @@
                values_tophp.push($(this).val());
        });
 
-       if($("#template_attrib") && values_tophp)
+       if(values_tophp.length > 0)
        {
-
-               $("#template_attrib").val(values_tophp);
-       //      document.form.template_attrib.value = values_tophp;
+               document.form.template_attrib.value = values_tophp;
        }
        document.form.submit();
 }

Modified: trunk/property/templates/base/admin_entity.xsl
===================================================================
--- trunk/property/templates/base/admin_entity.xsl      2017-11-03 17:54:03 UTC 
(rev 17270)
+++ trunk/property/templates/base/admin_entity.xsl      2017-11-04 11:01:45 UTC 
(rev 17271)
@@ -440,7 +440,7 @@
                <xsl:value-of select="lookup_functions"/>
                var base_java_url = <xsl:value-of select="base_java_url"/>;
        </script>
-       
+
        <xsl:choose>
                <xsl:when test="msgbox_data != ''">
                        <dl>
@@ -498,13 +498,13 @@
                                                <label>
                                                        <xsl:value-of 
select="php:function('lang', 'name')"/>
                                                </label>
-                                                               
+
                                                <input type="text" 
data-validation="required" name="values[name]" value="{value_name}">
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="lang_name_standardtext"/>
                                                        </xsl:attribute>
                                                </input>
-                                                               
+
                                        </div>
                                        <div class="pure-control-group">
                                                <label>
@@ -898,11 +898,11 @@
                                                                                
</xsl:call-template>
                                                                        
</xsl:if>
                                                                </xsl:for-each>
-                                                               <input 
type="hidden" name="template_attrib" value=""/>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
                                        <div class="pure-controls">
+                                               <input type="hidden" 
name="template_attrib" value=""/>
                                                <input type="button" 
class="pure-button pure-button-primary" name="values[save]" value="{lang_save}" 
onClick="onActionsClick();">
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="php:function('lang', 'save')"/>
@@ -1247,7 +1247,7 @@
                self.name="first_Window";
                <xsl:value-of select="lookup_functions"/>
        </script>
-       
+
        <dl>
                <xsl:choose>
                        <xsl:when test="msgbox_data != ''">
@@ -1264,7 +1264,7 @@
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                        <div id="general">
-                                                   
+
                                <div class="pure-control-group">
                                        <label>
                                                <xsl:value-of 
select="lang_entity"/>