Skip to content
This repository was archived by the owner on Oct 5, 2020. It is now read-only.

Commit 14c577f

Browse files
grtjngrtjn
authored
Merge pull request #476 from grtjn/master
Sinon fix, and some more..
2 parents a40f81f + 6237486 commit 14c577f

File tree

27 files changed

+259
-247
lines changed

27 files changed

+259
-247
lines changed

‎app/templates/bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"devDependencies": {
5252
"angular-mocks": "~1.4.4",
5353
"bardjs": "~0.1.8",
54-
"sinon": "http://sinonjs.org/releases/sinon-1.16.1.js"
54+
"sinon": "*"
5555
},
5656
"private": true,
5757
"resolutions": {

‎app/templates/import-sample-data.options‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sample-data.zip
99
data,data/people
1010

1111
-output_permissions
12-
@sample-app-role,read,@sample-app-role,update
12+
${app-role},read,${app-role},update
1313

1414
-output_uri_replace
1515
".*\.zip,''"

‎app/templates/ui/app/create/create.html‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<div class="create">
2-
<div class="row" ng-if="!rootCtrl.currentUser">
2+
<div class="row" ng-if="!$rootCtrl.currentUser">
33
<div class="col-sm-12">
44
<uib-alert type="warning">Not allowed</uib-alert>
55
</div>
66
</div>
77

8-
<div class="row" ng-if="rootCtrl.currentUser.disallowUpdates">
8+
<div class="row" ng-if="$rootCtrl.currentUser.disallowUpdates">
99
<div class="col-sm-12">
1010
<uib-alert type="warning">Updates are disallowed</uib-alert>
1111
</div>
1212
</div>
1313

14-
<div ng-if="!rootCtrl.currentUser.disallowUpdates">
14+
<div ng-if="!$rootCtrl.currentUser.disallowUpdates">
1515
<div class="row">
1616
<div class="col-sm-2">
1717
</div>
18-
<h2 class="col-sm-10" ng-if="ctrl.mode === 'create'">Create a Document</h2>
19-
<h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
18+
<h2 class="col-sm-10" ng-if="$ctrl.mode === 'create'">Create a Document</h2>
19+
<h2 class="col-sm-10" ng-if="$ctrl.mode === 'edit'">Edit "{{ $ctrl.uri }}"</h2>
2020
</div>
2121
<form class="form-horizontal" name="createForm" novalidate>
2222
<div class="form-group">
@@ -43,7 +43,7 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
4343
<div class="form-group">
4444
<label class="col-sm-2 control-label required">Name</label>
4545
<div class="col-sm-10">
46-
<input type="text" class="form-control" placeholder="person's name" ng-model="ctrl.person.name"
46+
<input type="text" class="form-control" placeholder="person's name" ng-model="$ctrl.person.name"
4747
required name="name" minlength="3" maxlength="100">
4848

4949
</div>
@@ -60,31 +60,31 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
6060
<div class="form-group">
6161
<label class="col-sm-2 control-label">About</label>
6262
<div class="col-sm-10">
63-
<textarea class="form-control" ui-tinymce="ctrl.editorOptions" ng-model="ctrl.person.about"></textarea>
63+
<textarea class="form-control" ui-tinymce="$ctrl.editorOptions" ng-model="$ctrl.person.about"></textarea>
6464
</div>
6565
</div>
6666
<div class="form-group">
6767
<label class="col-sm-2 control-label">Greeting</label>
6868
<div class="col-sm-10">
69-
<input type="text" class="form-control" ng-model="ctrl.person.greeting" placeholder="How this person should be greeted on login">
69+
<input type="text" class="form-control" ng-model="$ctrl.person.greeting" placeholder="How this person should be greeted on login">
7070
</div>
7171
</div>
7272
<div class="form-group">
7373
<label class="col-sm-2 control-label">Balance</label>
7474
<div class="col-sm-10">
75-
<input type="text" class="form-control" ng-model="ctrl.person.balance" placeholder="">
75+
<input type="text" class="form-control" ng-model="$ctrl.person.balance" placeholder="">
7676
</div>
7777
</div>
7878
<div class="form-group">
7979
<label class="col-sm-2 control-label">Picture</label>
8080
<div class="col-sm-10">
81-
<input type="text" class="form-control" ng-model="ctrl.person.picture" placeholder="">
81+
<input type="text" class="form-control" ng-model="$ctrl.person.picture" placeholder="">
8282
</div>
8383
</div>
8484
<div class="form-group">
8585
<label class="col-sm-2 control-label">Age</label>
8686
<div class="col-sm-10">
87-
<input type="number" class="form-control" ng-model="ctrl.person.age" placeholder="" name="age" string-to-number>
87+
<input type="number" class="form-control" ng-model="$ctrl.person.age" placeholder="" name="age" string-to-number>
8888
</div>
8989
</div>
9090
<div class="row form-error" ng-if="(createForm.$submitted || createForm.age.$touched) && createForm.age.$error">
@@ -97,7 +97,7 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
9797
<div class="form-group">
9898
<label class="col-sm-2 control-label required">Eye Color</label>
9999
<div class="col-sm-10">
100-
<input type="text" class="form-control" ng-model="ctrl.person.eyeColor" placeholder="" name="eyeColor" required>
100+
<input type="text" class="form-control" ng-model="$ctrl.person.eyeColor" placeholder="" name="eyeColor" required>
101101
</div>
102102
</div>
103103
<div class="row form-error" ng-if="(createForm.$submitted || createForm.eyeColor.$touched) && createForm.eyeColor.$error">
@@ -110,12 +110,12 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
110110
<div class="form-group">
111111
<label class="col-sm-2 control-label required">Gender</label>
112112
<div class="col-sm-1">
113-
<label class="radio-inline"><input type="radio" value="female" ng-model="ctrl.person.gender"
114-
placeholder="" name="gender" ng-required="!ctrl.person.gender">Female</label>
113+
<label class="radio-inline"><input type="radio" value="female" ng-model="$ctrl.person.gender"
114+
placeholder="" name="gender" ng-required="!$ctrl.person.gender">Female</label>
115115
</div>
116116
<div class="col-sm-1">
117-
<label class="radio-inline"><input type="radio" value="male" ng-model="ctrl.person.gender"
118-
placeholder="" name="gender" ng-required="!ctrl.person.gender">Male</label>
117+
<label class="radio-inline"><input type="radio" value="male" ng-model="$ctrl.person.gender"
118+
placeholder="" name="gender" ng-required="!$ctrl.person.gender">Male</label>
119119
</div>
120120
</div>
121121
<div class="row form-error" ng-if="(createForm.$submitted || createForm.gender.$touched) && createForm.gender.$error">
@@ -128,13 +128,13 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
128128
<div class="form-group">
129129
<label class="col-sm-2 control-label">Company</label>
130130
<div class="col-sm-10">
131-
<input type="text" class="form-control" ng-model="ctrl.person.company" placeholder="">
131+
<input type="text" class="form-control" ng-model="$ctrl.person.company" placeholder="">
132132
</div>
133133
</div>
134134
<div class="form-group">
135135
<label class="col-sm-2 control-label">Email</label>
136136
<div class="col-sm-10">
137-
<input type="email" class="form-control" ng-model="ctrl.person.email" placeholder="" name="email">
137+
<input type="email" class="form-control" ng-model="$ctrl.person.email" placeholder="" name="email">
138138
</div>
139139
</div>
140140
<div class="row form-error" ng-if="(createForm.$submitted || createForm.email.$touched) && createForm.email.$error">
@@ -147,24 +147,24 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
147147
<div class="form-group">
148148
<label class="col-sm-2 control-label">Phone</label>
149149
<div class="col-sm-10">
150-
<input type="text" class="form-control" ng-model="ctrl.person.phone" placeholder="">
150+
<input type="text" class="form-control" ng-model="$ctrl.person.phone" placeholder="">
151151
</div>
152152
</div>
153153
<div class="form-group">
154154
<label class="col-sm-2 control-label">Address</label>
155155
<div class="col-sm-10">
156-
<input type="text" class="form-control" ng-model="ctrl.person.address" placeholder="">
156+
<input type="text" class="form-control" ng-model="$ctrl.person.address" placeholder="">
157157
</div>
158158
</div>
159159
<div class="form-group">
160160
<label class="col-sm-2 control-label">Location</label>
161161
<div class="col-sm-5">
162-
<input type="number" class="form-control" ng-model="ctrl.person.location.latitude" placeholder=""
163-
min="-90" max="90" name="latitude" ng-required="ctrl.person.location.longitude" string-to-number>
162+
<input type="number" class="form-control" ng-model="$ctrl.person.location.latitude" placeholder=""
163+
min="-90" max="90" name="latitude" ng-required="$ctrl.person.location.longitude" string-to-number>
164164
</div>
165165
<div class="col-sm-5">
166-
<input type="number" class="form-control" ng-model="ctrl.person.location.longitude" placeholder=""
167-
min="-180" max="180" name="longitude" ng-required="ctrl.person.location.latitude" string-to-number>
166+
<input type="number" class="form-control" ng-model="$ctrl.person.location.longitude" placeholder=""
167+
min="-180" max="180" name="longitude" ng-required="$ctrl.person.location.latitude" string-to-number>
168168
</div>
169169
</div>
170170
<div class="row form-error" ng-if="(createForm.$submitted || createForm.latitude.$touched) && createForm.latitude.$error">
@@ -188,33 +188,33 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
188188
<div class="form-group">
189189
<label class="col-sm-2 control-label">Tags</label>
190190
<div class="col-sm-10">
191-
<input type="text" ng-model="ctrl.newTag">
192-
<button class="add-feature btn btn-info btn-sm" ng-click="ctrl.addTag()">Add</button>
191+
<input type="text" ng-model="$ctrl.newTag">
192+
<button class="add-feature btn btn-info btn-sm" ng-click="$ctrl.addTag()">Add</button>
193193
</div>
194194
<div class="col-sm-10 col-sm-offset-2">
195-
<div class="tag btn btn-info" ng-repeat="tag in ctrl.person.tags track by $index">
195+
<div class="tag btn btn-info" ng-repeat="tag in $ctrl.person.tags track by $index">
196196
<span>{{tag}}</span>
197-
<span class="glyphicon glyphicon-remove-circle" ng-click="ctrl.removeTag($index)"></span>
197+
<span class="glyphicon glyphicon-remove-circle" ng-click="$ctrl.removeTag($index)"></span>
198198
</div>
199199
</div>
200200
</div>
201201
<div class="form-group">
202202
<label class="col-sm-2 control-label">Active</label>
203203
<div class="col-sm-10">
204-
<input type="checkbox" ng-model="ctrl.person.isActive" ng-true-value="'true'" ng-false-value="'false'">
204+
<input type="checkbox" ng-model="$ctrl.person.isActive" ng-true-value="'true'" ng-false-value="'false'">
205205
</div>
206206
</div>
207207
<div class="form-group">
208208
<label class="col-sm-2 control-label required">Document Format</label>
209209
<div class="col-sm-1">
210-
<label class="radio-inline"><input type="radio" name="docFormat" value="json" ng-model="ctrl.person.docFormat" placeholder=""
211-
ng-disabled="ctrl.mode == 'edit'"
212-
ng-required="!ctrl.person.docFormat">JSON</label>
210+
<label class="radio-inline"><input type="radio" name="docFormat" value="json" ng-model="$ctrl.person.docFormat" placeholder=""
211+
ng-disabled="$ctrl.mode == 'edit'"
212+
ng-required="!$ctrl.person.docFormat">JSON</label>
213213
</div>
214214
<div class="col-sm-9">
215-
<label class="radio-inline"><input type="radio" name="docFormat" value="xml" ng-model="ctrl.person.docFormat" placeholder=""
216-
ng-disabled="ctrl.mode == 'edit'"
217-
ng-required="!ctrl.person.docFormat">XML</label>
215+
<label class="radio-inline"><input type="radio" name="docFormat" value="xml" ng-model="$ctrl.person.docFormat" placeholder=""
216+
ng-disabled="$ctrl.mode == 'edit'"
217+
ng-required="!$ctrl.person.docFormat">XML</label>
218218
</div>
219219
</div>
220220
<div class="row form-error" ng-if="(createForm.$submitted || createForm.docFormat.$touched) && createForm.docFormat.$error">
@@ -226,8 +226,8 @@ <h2 class="col-sm-10" ng-if="ctrl.mode === 'edit'">Edit "{{ ctrl.uri }}"</h2>
226226
</div>
227227
<div class="row">
228228
<div class="col-md-2 col-md-offset-9">
229-
<a class="btn btn-default" ui-sref="{{ctrl.prevState}}">Cancel</a>
230-
<button class="btn btn-primary" ng-click="createForm.$valid && ctrl.submit()">Submit</button>
229+
<a class="btn btn-default" ui-sref="{{$ctrl.prevState}}">Cancel</a>
230+
<button class="btn btn-primary" ng-click="createForm.$valid && $ctrl.submit()">Submit</button>
231231
</div>
232232
</div>
233233
</form>

‎app/templates/ui/app/detail/detail.html‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,45 @@
22
<div class="col-sm-8 content-col">
33
<!-- note - ->
44
<uib-tabset type="pills">
5-
<uib-tab ng-if="ctrl.type==='json'">
5+
<uib-tab ng-if="$ctrl.type==='json'">
66
<uib-tab-heading>JSON</uib-tab-heading>
77
<div class="col-sm-9">
8-
<json-explorer data="ctrl.json"></json-explorer>
8+
<json-explorer data="$ctrl.json"></json-explorer>
99
</div>
1010
</uib-tab>
11-
<uib-tab ng-if="ctrl.type==='xml' || ctrl.type==='txt'">
11+
<uib-tab ng-if="$ctrl.type==='xml' || $ctrl.type==='txt'">
1212
<uib-tab-heading >XML</uib-tab-heading>
1313
<div class="col-sm-9">
14-
<pre class="pre-xml">{{ctrl.xml}}</pre>
14+
<pre class="pre-xml">{{$ctrl.xml}}</pre>
1515
</div>
1616
</uib-tab>
17-
<uib-tab ng-if="ctrl.type==='binary'">
17+
<uib-tab ng-if="$ctrl.type==='binary'">
1818
<uib-tab-heading >Binary</uib-tab-heading>
1919
<div class="col-sm-9">
20-
<a target="_blank" ng-href="/v1/documents?uri={{ctrl.uri}}&transform=download"
20+
<a target="_blank" ng-href="/v1/documents?uri={{$ctrl.uri}}&transform=download"
2121
class="btn btn-default">Download</a>
2222
</div>
2323
</uib-tab>
2424
</uib-tabset-->
25-
<view-file uri="ctrl.viewUri" content-type="ctrl.contentType"
26-
allow-modal="true" controls="true" download-uri="ctrl.downloadUri"
27-
file-name="ctrl.fileName" show-code="false" trust-uri="false">
25+
<view-file uri="$ctrl.viewUri" content-type="$ctrl.contentType"
26+
allow-modal="true" controls="true" download-uri="$ctrl.downloadUri"
27+
file-name="$ctrl.fileName" show-code="false" trust-uri="false">
2828
</view-file>
2929
</div>
3030
<div class="col-sm-4 right-col">
3131
<div id="buttons-detail">
3232
<button class="btn btn-default" ui-sref="root.search">Search</button>
3333
<button class="btn btn-primary"
34-
ng-show="!rootCtrl.currentUser.disallowUpdates"
35-
ui-sref="root.edit({uri: ctrl.uri, prev: 'root.view'})">Edit</button>
34+
ng-show="!$rootCtrl.currentUser.disallowUpdates"
35+
ui-sref="root.edit({uri: $ctrl.uri, prev: 'root.view'})">Edit</button>
3636
<button class="btn btn-primary"
37-
ng-show="!rootCtrl.currentUser.disallowUpdates"
37+
ng-show="!$rootCtrl.currentUser.disallowUpdates"
3838
mwl-confirm
39-
title="This will permanently delete {{ctrl.uri}}, are you sure?"
39+
title="This will permanently delete {{$ctrl.uri}}, are you sure?"
4040
confirm-text="Yes"
4141
cancel-text="No"
4242
placement="bottom"
43-
on-confirm="ctrl.delete()"
43+
on-confirm="$ctrl.delete()"
4444
on-cancel="cancelClicked = true"
4545
confirm-button-type="danger"
4646
cancel-button-type="default">Delete</button>
@@ -50,7 +50,7 @@
5050
<div class="panel panel-default similar">
5151
<div class="panel-heading">Similar</div>
5252
<div class="panel-body">
53-
<ml-similar uri="{{ctrl.uri}}" limit="5"></ml-similar>
53+
<ml-similar uri="{{$ctrl.uri}}" limit="5"></ml-similar>
5454
</div>
5555
</div>
5656
</div>

‎app/templates/ui/app/login/login-full.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="row">
22
<div class="col-md-6 col-md-offset-3">
33
<div class="jumbotron login-box">
4-
<login mode="horizonal" show-cancel="ctrl.showCancel" callback="ctrl.toState(user)"></login>
4+
<login mode="horizonal" show-cancel="$ctrl.showCancel" callback="$ctrl.toState(user)"></login>
55
</div>
66
</div>
77
</div>

‎app/templates/ui/app/login/login-modal.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div>
22
<div class="modal-header">
3-
<button type="button" class="close" ng-click="ctrl.close()">
3+
<button type="button" class="close" ng-click="$ctrl.close()">
44
<span aria-hidden="true">&times;</span>
55
<span class="sr-only">Close</span>
66
</button>
77
<h4 class="modal-title">Login</h4>
88
</div>
99
<div class="modal-body">
10-
<login mode="horizonal" show-cancel="ctrl.showCancel" callback="ctrl.close(user)"></login>
10+
<login mode="horizonal" show-cancel="$ctrl.showCancel" callback="$ctrl.close(user)"></login>
1111
</div>
1212
</div>

‎app/templates/ui/app/login/login.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div>
2-
<form ng-class="{'navbar-form navbar-right': mode === 'inline' }" ng-submit="ctrl.login()">
3-
<div class="alert alert-danger" ng-show="ctrl.loginService.loginError()" ng-cloak>Username and/or Password Incorrect</div>
2+
<form ng-class="{'navbar-form navbar-right': mode === 'inline' }" ng-submit="$ctrl.login()">
3+
<div class="alert alert-danger" ng-show="$ctrl.loginService.loginError()" ng-cloak>Username and/or Password Incorrect</div>
44
<div class="form-group">
5-
<input type="text" placeholder="Username" class="form-control" ng-model="ctrl.username">
5+
<input type="text" placeholder="Username" class="form-control" ng-model="$ctrl.username">
66
</div>
77
<div class="form-group">
8-
<input type="password" placeholder="Password" class="form-control" ng-model="ctrl.password">
8+
<input type="password" placeholder="Password" class="form-control" ng-model="$ctrl.password">
99
</div>
10-
<button ng-if="showCancel" type="button" class="btn btn-default" ng-click="ctrl.cancel()">Cancel</button>
10+
<button ng-if="showCancel" type="button" class="btn btn-default" ng-click="$ctrl.cancel()">Cancel</button>
1111
<button type="submit" class="btn btn-success">Sign in</button>
1212
</form>
1313
</div>

‎app/templates/ui/app/login/login.service.js‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
}
4343

4444
return $http.get('/api/user/status', {}).then(function(response) {
45-
if (response.data.appUsersOnly) {
46-
_userPrefix = response.data.appName + '-';
47-
}
4845
if (response.data.authenticated === false) {
4946
_isAuthenticated = false;
47+
if (response.data.appUsersOnly) {
48+
_userPrefix = response.data.appName + '-';
49+
}
5050
}
5151
else
5252
{
@@ -59,6 +59,9 @@
5959
function loginSuccess(response) {
6060
_loginError = null;
6161
_isAuthenticated = true;
62+
if (response.data.appUsersOnly) {
63+
_userPrefix = response.data.appName + '-';
64+
}
6265
$rootScope.$broadcast('loginService:login-success', response.data);
6366
}
6467

@@ -72,6 +75,15 @@
7275
}, failLogin);
7376
}
7477

78+
function switchLogin(username) {
79+
return $http.post('/api/user/switch', {
80+
'username': username
81+
}).then(function(response) {
82+
loginSuccess(response);
83+
return response;
84+
}, failLogin);
85+
}
86+
7587
function loginPrompt() {
7688
var d = $q.defer();
7789
if (_loginMode === 'modal') {
@@ -188,6 +200,7 @@
188200
angular.extend(service, {
189201
login: login,
190202
logout: logout,
203+
switch: switchLogin,
191204
loginPrompt: loginPrompt,
192205
loginError: loginError,
193206
loginMode: loginMode,

0 commit comments

Comments
 (0)