minor bugfixes

pull/306/merge
Justin Richer 2013-02-02 20:00:18 -05:00
parent d1968f624a
commit e5171a196a
2 changed files with 14 additions and 11 deletions

View File

@ -207,6 +207,9 @@
defaults:{
id:null,
description:null,
icon:null,
value:null,
defaultScope:false,
allowDynReg:false
},
@ -1147,12 +1150,12 @@
initialize:function() {
if (!this.template) {
this.template = _.template($('#tmpl-system-scope-form').html());
this.template = _.template($('#tmpl-system-scope-form').html());
}
},
events:{
'click .btn-save':'saveSope',
'click .btn-save':'saveScope',
'click .btn-cancel': function() {window.history.back(); return false; }
},
@ -1179,7 +1182,7 @@
},
render: function(eventName) {
$(this.el).html(this.template(this.model.toJSON()));
this.$el.html(this.template(this.model.toJSON()));
return this;
}

View File

@ -538,7 +538,7 @@
<div class="well well-small">
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> Refresh</button> &nbsp;
<button class="btn btn-small btn-primary new-client"><i class="icon-plus icon-white"></i> New Scope</button>
<button class="btn btn-small btn-primary new-scope"><i class="icon-plus icon-white"></i> New Scope</button>
</div>
<table id="scope-table" class="table table-hover table-striped">
@ -555,7 +555,7 @@
<div class="well well-small">
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> Refresh</button> &nbsp;
<button class="btn btn-small btn-primary new-client"><i class="icon-plus icon-white"></i> New Scope</button>
<button class="btn btn-small btn-primary new-scope"><i class="icon-plus icon-white"></i> New Scope</button>
</div>
</script>
@ -580,7 +580,7 @@
</script>
<script type="text/html" id="tmpl-system-scope-form">
<h1><%= id == null ? 'New' : 'Edit')%> Scope</h1>
<h1><%= id == null ? 'New' : 'Edit'%> Scope</h1>
<form class="form-horizontal">
<fieldset>
@ -593,7 +593,7 @@
<div class="control-group" id="value">
<label class="control-label">Scope value</label>
<div class="controls">
<input value="<%=value%>" type="text" class="" placeholder="scope">
<input value="<%=value != null ? value : ''%>" type="text" class="" placeholder="scope">
<p class="help-block">Single string with no spaces</p>
</div>
</div>
@ -601,7 +601,7 @@
<div class="control-group" id="description">
<label class="control-label">Description</label>
<div class="controls">
<textarea class="input-xlarge" placeholder="Type a description" maxlength="200" rows="3"><%=description%></textarea>
<textarea class="input-xlarge" placeholder="Type a description" maxlength="200" rows="3"><%=description != null ? description : ''%></textarea>
<p class="help-block">Human-readable text description</p>
</div>
</div>
@ -609,7 +609,7 @@
<div class="control-group" id="defaultScope">
<div class="controls">
<label class="checkbox">
<input type="checkbox" <%=defaultScope ? 'checked' : ''%>> default scope
<input type="checkbox" <%=defaultScope ? 'checked' : '' %>> default scope
</label>
<p class="help-block">Newly-created clients get this scope by default?</p>
</div>
@ -618,7 +618,7 @@
<div class="control-group" id="allowDynReg">
<div class="controls">
<label class="checkbox">
<input type="checkbox" <%=allowDynReg ? 'checked' : ''%>> allow dynamic registration
<input type="checkbox" <%=allowDynReg ? 'checked' : '' %>> allow dynamic registration
</label>
<p class="help-block">Allow dynamically registered clients to request this scope?</p>
</div>
@ -631,4 +631,4 @@
</fieldset>
</form>
</script>
</script>