Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for admin api

Browse Source
This commit is contained in:
Athou
2013-04-18 12:50:44 +02:00
parent 9bd825d786
commit af109ccf5c
30 changed files with 1000 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/templates/_subscribe.html
View File

@@ -34,7 +34,7 @@
<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 SubscriptionService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
<option ng-repeat="cat in CategoryService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
</select>
<span class="help-block" ng-show="!subscribeForm.category.$valid">Required</span>
</div>
@@ -51,7 +51,7 @@
<button type="button" class="close" ng-click="closeImport()">&times;</button>
<h4>Import</h4>
</div>
<form ng-upload class="form-horizontal" action="rest/subscriptions/import">
<form ng-upload class="form-horizontal" action="rest/feed/import">
<div class="modal-body">
<div class="control-group">
<div>Let me import your feeds from your
@@ -93,7 +93,7 @@
<label class="control-label">Parent</label>
<div class="controls">
<select name="category" ng-model="cat.parentId" class="input-block-level" required>
<option ng-repeat="cat in SubscriptionService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
<option ng-repeat="cat in CategoryService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
</select>
<span class="help-block" ng-show="!categoryForm.category.$valid">Required</span>
</div>

2
src/main/webapp/templates/_tree.html
View File

@@ -1,6 +1,6 @@
<div class="css-treeview" ng-controller="CategoryTreeCtrl">
<ul>
<category node="SubscriptionService.subscriptions"
<category node="CategoryService.subscriptions"
feed-click="feedClicked(id)" category-click="categoryClicked(id)"
selected-type="selectedType" selected-id="selectedId"
format-category-name="formatCategoryName(category)"