Skip to content

Commit 316b625

Browse files
committed
Refactor: TagCtrl.
1 parent 7f77452 commit 316b625

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

static/app/js/jgApp.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@ angular.module('jgApp.controllers', []).
4343
id: 0
4444
}).
4545
success(function(data, status, headers, config) {
46-
var obj = angular.fromJson(data);
47-
$scope.tag = {
48-
id: $routeParams.tagId,
49-
name: obj.result.name,
50-
};
51-
$scope.subtags = obj.result.tags;
52-
$scope.problems = obj.result.problems;
53-
$scope.tagged = obj.result.tagged;
46+
$scope.tag = angular.fromJson(data).result;
5447
}).
5548
error(function(data, status, headers, config) {
5649
// TODO on error

static/app/partials/tag.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
<div ng-show="subtags.length || problems.length">
1+
<div ng-show="tag.tags.length || tag.problems.length">
22
<p>Item tagged by {{tag.name}}.</p>
3-
<div class="tags" ng-show="subtags.length">
3+
<div class="tags" ng-show="tag.tags.length">
44
<p>Tags</p>
55
<ul>
6-
<li ng-repeat="subtag in subtags"><a href="#/tag/{{subtag.id}}">{{subtag.name}}</a></li>
6+
<li ng-repeat="subtag in tag.tags"><a href="#/tag/{{subtag.id}}">{{subtag.name}}</a></li>
77
</ul>
88
</div>
9-
<div class="problems" ng-show="problems.length">
9+
<div class="problems" ng-show="tag.problems.length">
1010
<p>Problems</p>
1111
<ul>
12-
<li ng-repeat="problem in problems"><a href="#/problem/{{problem.id}}">{{problem.name}}</a></li>
12+
<li ng-repeat="problem in tag.problems"><a href="#/problem/{{problem.id}}">{{problem.name}}</a></li>
1313
</ul>
1414
</div>
1515
</div>
16-
<div ng-hide="subtags.length || problems.length">
16+
<div ng-hide="tag.tags.length || tag.problems.length">
1717
<p>No item tagged by {{tag.name}}.</p>
1818
</div>
19-
<div ng-show="tagged.length">
19+
<div ng-show="tag.tagged.length">
2020
<p>Tagged by:</p>
2121
<ul>
22-
<li ng-repeat="tagby in tagged"><a href="#/tag/{{tagby.id}}">{{tagby.name}}</a></li>
22+
<li ng-repeat="tagby in tag.tagged"><a href="#/tag/{{tagby.id}}">{{tagby.name}}</a></li>
2323
</ul>
2424
</div>
25-
<div ng-hide="tagged.length">
25+
<div ng-hide="tag.tagged.length">
2626
<p>Not tagged by anyone.</p>
2727
</div>

0 commit comments

Comments
 (0)