From d0c4230e248012169edbc4e4e1a5e6f9847a2c21 Mon Sep 17 00:00:00 2001 From: opi Date: Mon, 1 Dec 2014 19:06:09 +0100 Subject: [PATCH] [enh] Allow only 1 DynDns domain (so don't show a useless form). --- js/app.js | 23 ++++++++++++++++++++++- views/domain/domain_add.ms | 4 +++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/js/app.js b/js/app.js index c36f2b47..d49960e9 100644 --- a/js/app.js +++ b/js/app.js @@ -348,6 +348,13 @@ app = Sammy('#main', function (sam) { * Filters * */ + sam.before(/domains\/add/, function (req){ + // Preload domains list. + req.params.domains = []; + req.api('/domains', function(data) { + req.params.domains = data.domains; + }); + }); sam.before(/apps\/install\//, function (req){ // Preload domains list. req.params.domains = []; @@ -857,7 +864,21 @@ app = Sammy('#main', function (sam) { c.params.ddomains = ['.nohost.me', '.noho.st']; }) .always(function() { - c.view('domain/domain_add', c.params); + data = { + ddomains : c.params.ddomains, + domains : c.params.domains, + allowDyndnsDomain : true + } + + // Allow only 1 DynDns domain. + var regex = data.ddomains.join('|') + $.each(data.domains, function(k, domain) { + if ( domain.search(regex) > 0 ) { + data.allowDyndnsDomain = false; + } + }); + + c.view('domain/domain_add', data); }); }); diff --git a/views/domain/domain_add.ms b/views/domain/domain_add.ms index 4c8daa82..fc74e6a3 100644 --- a/views/domain/domain_add.ms +++ b/views/domain/domain_add.ms @@ -17,7 +17,7 @@ -
+
{{t 'domain_add_dns_doc'}}
@@ -30,6 +30,7 @@
+ {{#if allowDyndnsDomain }}

@@ -59,6 +60,7 @@

+ {{/if}}