raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Columns service updates state of columns (especially id) when data received from server

Browse Source 
Also showing saving status
This commit is contained in:
Rob Harrington
2016-05-19 12:44:56 +10:00
parent 924d155012
commit b804a70469
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/admin/dropdown/controllers/columns_dropdown_controller.js.coffee
View File

@@ -1,5 +1,10 @@
angular.module("admin.dropdown").controller "ColumnsDropdownCtrl", ($scope, Columns) ->
$scope.columns = Columns.columns
$scope.toggle = Columns.toggleColumn
$scope.saveColumnPreferences = Columns.savePreferences
$scope.saved = Columns.preferencesSaved
$scope.saving = false
$scope.saveColumnPreferences = (action_name) ->
$scope.saving = true
Columns.savePreferences(action_name).then ->
$scope.saving = false

3
app/assets/javascripts/admin/index_utils/services/columns.js.coffee
View File

@@ -31,4 +31,5 @@ angular.module("admin.indexUtils").factory 'Columns', ($rootScope, $http, column
column_preferences: (preference for column_name, preference of @columns)
.success (data) =>
for column in data
@savedColumns[column.column_name] = column
angular.extend(@columns[column.column_name], column)
angular.extend(@savedColumns[column.column_name], column)

3
app/assets/javascripts/templates/admin/columns_dropdown.html.haml
View File

@@ -7,4 +7,5 @@
%span.name {{column.name }}
%hr
%div.menu_item.text-center
%input.fullwidth.red{ type: "button", ng: { value: "saved() ? 'Saved': 'Save As Default'", disabled: "saved()", click: "saveColumnPreferences(action)"} }
%input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } }
%input.fullwidth.red{ type: "button", value: 'Save As Default', ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }

5
app/assets/stylesheets/admin/openfoodnetwork.css.scss
View File

@@ -43,6 +43,11 @@ input.red {
margin-right: 5px;
}
input.orange {
background-color: #FF9848;
margin-right: 5px;
}
input.search {
margin-bottom: 1em;
}