Commit 759e8d6a authored by Henning Leutz's avatar Henning Leutz 🥋

Merge branch 'dev'

parents 12cc6813 371638e2
...@@ -69,6 +69,11 @@ QUI::$Ajax->registerFunction( ...@@ -69,6 +69,11 @@ QUI::$Ajax->registerFunction(
$Address->setAttributes($data); $Address->setAttributes($data);
$Address->save(); $Address->save();
if (isset($data['standard']) && $data['standard'] === 1) {
$User->setAttribute('address', $Address->getId());
$User->save();
}
return $Address->getId(); return $Address->getId();
}, },
['uid', 'aid', 'data'], ['uid', 'aid', 'data'],
......
...@@ -313,7 +313,8 @@ define('controls/users/Address', [ ...@@ -313,7 +313,8 @@ define('controls/users/Address', [
city : this.$City.value, city : this.$City.value,
country : this.$Country.value, country : this.$Country.value,
mails : emails, mails : emails,
phone : this.$PhoneGrid.getData() phone : this.$PhoneGrid.getData(),
standard : this.$Standard.checked ? 1 : 0
}; };
Ajax.post('ajax_users_address_save', function () { Ajax.post('ajax_users_address_save', function () {
......
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
{if $Template->getAttribute('html5') === false} {if $Template->getAttribute('html5') === false}
<meta http-equiv="content-language" content="{$Project->getlang()}" /> <meta http-equiv="content-language" content="{$Project->getlang()}" />
<meta name="page-topic" content="{$Site->getAttribute('title')|escape:"html"}" /> <meta name="page-topic" content='{$Site->getAttribute('title')|escape:'html'}" />
<meta name="date" content="{$Site->getAttribute('e_date')}" /> <meta name="date" content="{$Site->getAttribute('e_date')}" />
<meta name="copyright" content="{$Project->getConfig('meta.copyright')}" /> <meta name="copyright" content="{$Project->getConfig('meta.copyright')}" />
<meta name="publisher" content="{$Project->getConfig('meta.publisher')}" /> <meta name="publisher" content="{$Project->getConfig('meta.publisher')}" />
{/if} {/if}
<meta name="description" content="{$Site->getAttribute('meta.description')|escape:"html"}" /> <meta name="description" content="{$Site->getAttribute('meta.description')|escape:'html'}" />
<meta name="keywords" content="{$Site->getAttribute('meta.keywords')|escape:"html"}" /> <meta name="keywords" content="{$Site->getAttribute('meta.keywords')|escape:'html'}" />
{if $Locale->no_translation} {if $Locale->no_translation}
<meta name="robots" content="noindex" /> <meta name="robots" content="noindex" />
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
{if $Template->getAttribute('requirejs')} {if $Template->getAttribute('requirejs')}
<!-- include components --> <!-- include components -->
<script src="{$URL_OPT_DIR}bin/requirejs/require.js?lu={$lastUpdate}"></script> <script src="{$URL_OPT_DIR}bin/requirejs/require.js?lu={$lastUpdate}" type="text/javascript"></script>
<script> <script>
require.config({ require.config({
baseUrl : URL_DIR, baseUrl : URL_DIR,
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
{/if} {/if}
{if isset($siteScript)} {if isset($siteScript)}
<script type="text/javascript" src="{$siteScript}"></script> <script src="{$siteScript}" type="text/javascript"></script>
{/if} {/if}
{$headerExtend} {$headerExtend}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment