mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
refactored a little bit
This commit is contained in:
@@ -237,11 +237,14 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
|
|||||||
$scope.CategoryService = CategoryService;
|
$scope.CategoryService = CategoryService;
|
||||||
|
|
||||||
CategoryService.get(function() {
|
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];
|
var cat = CategoryService.flatCategories[i];
|
||||||
if (cat.id == $stateParams._id) {
|
if (cat.id == $stateParams._id) {
|
||||||
$scope.category = angular.copy(cat);
|
$scope.category = {
|
||||||
$scope.category.name = $scope.category.origName;
|
id: cat.id,
|
||||||
|
name: cat.orig.name,
|
||||||
|
parentId: cat.orig.parentId,
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ function($resource, $http) {
|
|||||||
array.push({
|
array.push({
|
||||||
id : category.id,
|
id : category.id,
|
||||||
name : name,
|
name : name,
|
||||||
origName: category.name
|
orig: category
|
||||||
});
|
});
|
||||||
if (category.children) {
|
if (category.children) {
|
||||||
for ( var i = 0; i < category.children.length; i++) {
|
for ( var i = 0; i < category.children.length; i++) {
|
||||||
|
|||||||
@@ -33,8 +33,8 @@
|
|||||||
<div class="control-group" ng-class="{error : !subscribeForm.category.$valid}">
|
<div class="control-group" ng-class="{error : !subscribeForm.category.$valid}">
|
||||||
<label class="control-label">Category</label>
|
<label class="control-label">Category</label>
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
<select name="category" ng-model="sub.categoryId" class="input-block-level" required>
|
<select name="category" ng-model="sub.categoryId" class="input-block-level"
|
||||||
<option ng-repeat="cat in CategoryService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
|
ng-options="cat.id as cat.name for cat in CategoryService.flatCategories" required>
|
||||||
</select>
|
</select>
|
||||||
<span class="help-block" ng-show="!subscribeForm.category.$valid">Required</span>
|
<span class="help-block" ng-show="!subscribeForm.category.$valid">Required</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<div class="control-group" ng-class="{error : !form.category.$valid}">
|
<div class="control-group" ng-class="{error : !form.category.$valid}">
|
||||||
<label class="control-label">Parent category</label>
|
<label class="control-label">Parent category</label>
|
||||||
<div class="controls">
|
<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">
|
ng-options="cat.id as cat.name for cat in CategoryService.flatCategories">
|
||||||
</select>
|
</select>
|
||||||
<span class="help-block" ng-show="!form.category.$valid">Required</span>
|
<span class="help-block" ng-show="!form.category.$valid">Required</span>
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
<label class="control-label">Feed URL</label>
|
<label class="control-label">Feed URL</label>
|
||||||
<div class="controls horizontal-align">
|
<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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user