From f9aa4995f95e3b7f9940b2dfee6aa8ebae47571f Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 30 Apr 2013 22:20:39 +0200
Subject: [PATCH] refactored a little bit

---
 src/main/webapp/js/controllers.js                     | 9 ++++++---
 src/main/webapp/js/services.js                        | 2 +-
 src/main/webapp/templates/_subscribe.html             | 4 ++--
 src/main/webapp/templates/feeds.category_details.html | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 3e7250aa..f99c0cf6 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -237,11 +237,14 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
 	$scope.CategoryService = CategoryService;
 	
 	CategoryService.get(function() {
-		for(var i = 0; i < CategoryService.flatCategories.length; i++){
+		for (var i = 0; i < CategoryService.flatCategories.length; i++) {
 			var cat = CategoryService.flatCategories[i];
 			if (cat.id == $stateParams._id) {
-				$scope.category = angular.copy(cat);
-				$scope.category.name = $scope.category.origName;
+				$scope.category = {
+					id: cat.id,
+					name: cat.orig.name,
+					parentId: cat.orig.parentId,
+				}
 				break;
 			}
 		}
diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
index 2ff9afeb..9b0e7e66 100644
--- a/src/main/webapp/js/services.js
+++ b/src/main/webapp/js/services.js
@@ -104,7 +104,7 @@ function($resource, $http) {
 		array.push({
 			id : category.id,
 			name : name, 
-			origName: category.name
+			orig: category
 		});
 		if (category.children) {
 			for ( var i = 0; i < category.children.length; i++) {
diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html
index c04fd45a..e95fa9f6 100644
--- a/src/main/webapp/templates/_subscribe.html
+++ b/src/main/webapp/templates/_subscribe.html
@@ -33,8 +33,8 @@
 				<div class="control-group" ng-class="{error : !subscribeForm.category.$valid}">
 					<label class="control-label">Category</label>
 					<div class="controls">
-						<select name="category" ng-model="sub.categoryId" class="input-block-level" required>
-							<option ng-repeat="cat in CategoryService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
+						<select name="category" ng-model="sub.categoryId" class="input-block-level" 
+							ng-options="cat.id as cat.name for cat in CategoryService.flatCategories" required>
 						</select>
 						<span class="help-block" ng-show="!subscribeForm.category.$valid">Required</span>
 					</div>
diff --git a/src/main/webapp/templates/feeds.category_details.html b/src/main/webapp/templates/feeds.category_details.html
index 554ecd61..00eef826 100644
--- a/src/main/webapp/templates/feeds.category_details.html
+++ b/src/main/webapp/templates/feeds.category_details.html
@@ -14,7 +14,7 @@
 		<div class="control-group" ng-class="{error : !form.category.$valid}">
 			<label class="control-label">Parent category</label>
 			<div class="controls">
-				<select name="category" class="input-block-level" ng-model="cat.parentId" 
+				<select name="category" class="input-block-level" ng-model="category.parentId" 
 					ng-options="cat.id as cat.name for cat in CategoryService.flatCategories">
 				</select>
 				<span class="help-block" ng-show="!form.category.$valid">Required</span>
@@ -24,7 +24,7 @@
 		<div class="control-group">
 			<label class="control-label">Feed URL</label>
 			<div class="controls horizontal-align">
-				<a href="{{'rest/category/entriesAsFeed?id=' + cat.id}}" target="_blank">{{'rest/category/entriesAsFeed?id=' + cat.id}}</a>
+				<a href="{{'rest/category/entriesAsFeed?id=' + category.id}}" target="_blank">{{'rest/category/entriesAsFeed?id=' + category.id}}</a>
 			</div>
 		</div>