Firewall enabled/disabled vice versa - fixed

Port mapping add tcpudp option - which one? It is already there. Previously it was assumed though that when it was missing that it would default to tcp so I have removed that default..

Chrome
Speed dialing number section saves wrong value to uci - works here. Older version perhaps?
DDNS provider dropdown box is messed up - fixed
Event log does not show up - fixed this missing functionality work around in chrome. Likely will fix several other issues in chrome.
Status DSL status shows up instead of Internet Voice IPTV - fixed by hiding dsl box from the start.
This commit is contained in:
Martin Schröder 2015-06-01 12:10:19 +02:00
parent 3b55fc88c9
commit 3cc1198397
6 changed files with 24 additions and 23 deletions

View file

@ -122,7 +122,7 @@
"redirect": {
"src_ip": { dvalue: "", type: String },
"src_dport": { dvalue: 0, type: String, validator: PortValidator },
"proto": { dvalue: "tcp", type: String },
"proto": { dvalue: "", type: String },
"dest_ip": { dvalue: "", type: String },
"dest_port": { dvalue: 0, type: String, validator: PortValidator }
},

View file

@ -1,4 +1,4 @@
<div class="radio radio-info">
<input type="radio" ng-model="ngModel.value" value="{{value}}"></input>
<label class="detail-strong-input" translate><strong>{{label}}</strong></label>
<input type="radio" ng-model="ngModel.value" value="{{value}}"></input>
<label class="detail-strong-input"><strong>{{label}}</strong></label>
</div>

View file

@ -1,16 +1,14 @@
$juci.module("core")
.directive("luciInputRadio", function () {
var plugin_root = $juci.module("core").plugin_root;
return {
templateUrl: plugin_root + "/widgets/luci.input.radio.html",
restrict: 'E',
replace: true,
scope: {
id: "=",
label: "=",
value: "=",
ngModel: "=",
inline: "="
}
};
});
.directive("luciInputRadio", function () {
var plugin_root = $juci.module("core").plugin_root;
return {
templateUrl: plugin_root + "/widgets/luci.input.radio.html",
restrict: 'E',
replace: true,
scope: {
label: "@",
value: "=",
ngModel: "="
}
};
});

View file

@ -6,10 +6,10 @@
<luci-config-lines>
<luci-config-line title="{{'DNS configuration'|translate}}">
<div class="col-md-6">
<luci-input-radio ng-model="wan.peerdns" label="'automatically'" value="0" />
<luci-input-radio ng-model="wan.peerdns" label="{{'Automatic' | translate}}" value="0" />
</div>
<div class="col-md-5 col-lg-offset-1">
<luci-input-radio ng-model="wan.peerdns" label="'manually'" value="1" />
<luci-input-radio ng-model="wan.peerdns" label="{{'Manual' | translate}}" value="1" />
</div>
</luci-config-line>
<luci-config-line title="{{'DNS Servers'|translate}} #{{$index}}" ng-show="wan.peerdns.value == 1" >
@ -29,7 +29,7 @@
</luci-config-lines>
<luci-config-lines ng-show="ddns.enabled.value">
<luci-config-line title="{{'Provider'|translate}}">
<luci-select ng-model="ddns" ng-items="allServices"></luci-select>
<luci-select ng-model="ddns" ng-items="allServices" placeholder="{{'Choose DNS Provider'|translate}}></luci-select>
</luci-config-line>
<luci-config-line title="{{'Domain name'|translate}}">
<input type="text" class="form-control" ng-model="ddns.domain.value" placeholder="{{'Add domain name'|translate}}" />

View file

@ -16,7 +16,10 @@ $juci.app.directive("uciFirewallNatRuleEdit", function($compile, $parse){
$scope.portIsRange = (rule.src_dport.value.indexOf("-") != -1) || (rule.dest_port.value.indexOf("-") != -1);
}
});
$scope.protocolChoices = ["udp", "tcp"];
$scope.protocolChoices = [
{ label: "UDP", value: "udp"},
{ label: "TCP", value: "tcp"}
];
$scope.patterns = {
ipaddress: /^(?!0)(?!.*\.$)((1?\d?\d|25[0-5]|2[0-4]\d)(\.|$)){4}$/,
port: /^\d{1,5}$/

View file

@ -20,7 +20,7 @@
</luci-config-line>
</luci-config-lines>
</luci-expandable>
<luci-expandable title="DSL" status="dsl_status" ng-show="dsl_status != 'disabled'">
<luci-expandable title="DSL" status="dsl_status" ng-show="dsl_status == 'ok' || dsl_status == 'progress'">
<luci-config-lines >
<luci-config-line title="{{'Line Status'|translate}}">
<strong>{{dslinfo.status}}</strong>