Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Showing with 13 additions and 24 deletions.
  1. +6 −6 app/scripts/app.js
  2. +2 −13 app/scripts/controllers/user.js
  3. +1 −1 dist/index.html
  4. +4 −0 dist/scripts/b295aeaa.main.js
  5. +0 −4 dist/scripts/ff270700.main.js
@@ -69,13 +69,13 @@ angular.module('fifoApp',
.when('/configuration/users', {
templateUrl: 'views/users.html',
controller: 'UsersCtrl',
helpUrl: help_url('user', 'list'),
helpUrl: help_url('usermanagement', 'user-list'),
name: 'Users'
})
.when('/configuration/groups', {
templateUrl: 'views/groups.html',
controller: 'GroupsCtrl',
helpUrl: help_url('group', 'list'),
helpUrl: help_url('usermanagement', 'group-list'),
name: 'Groups'
})
.when('/configuration/organizations', {
@@ -127,13 +127,13 @@ angular.module('fifoApp',
})
.when('/configuration/users/new', {
templateUrl: 'views/user-new.html',
helpUrl: help_url('user', 'create'),
helpUrl: help_url('usermanagement', 'user-new'),
controller: 'UserNewCtrl'
})
.when('/configuration/users/:uuid', {
templateUrl: 'views/user.html',
controller: 'UserCtrl',
helpUrl: help_url('user', 'details')
helpUrl: help_url('usermanagement', 'user-details')
})
.when('/about', {
templateUrl: 'views/about.html',
@@ -142,12 +142,12 @@ angular.module('fifoApp',
})
.when('/configuration/groups/new', {
templateUrl: 'views/group-new.html',
helpUrl: help_url('group', 'create'),
helpUrl: help_url('usermanagement', 'group-new'),
controller: 'GroupNewCtrl'
})
.when('/configuration/groups/:uuid', {
templateUrl: 'views/group.html',
helpUrl: help_url('group', 'details'),
helpUrl: help_url('usermanagement', 'group-details'),
controller: 'GroupCtrl'
})
.when('/configuration/organizations/new', {
@@ -14,18 +14,6 @@ angular.module('fifoApp')
if (c[entity][e]) {
callback(c[entity][e]);
} else {
// wiggle[entity].get(
// {id: e},
// {
// success: function(elem) {
// c[entity][e] = elem;
// callback(elem);
// },
// failure: function(err,status){
// c[entity][e] = {id: e, alias: "DELETED"};
// console.log("Err",err,status);
// }
// });
wiggle[entity].get({id: e}, function success(elem) {
console.log("Got", entity, e);
c[entity][e] = elem;
@@ -313,8 +301,9 @@ angular.module('fifoApp')
}
});
})
wiggle.orgs.query(function(o) {
wiggle.orgs.query(function(os) {
$scope.orgs = os;
console.log($scope.orgs)
os.forEach(function(o) {

if ($scope.user._orgs[o.uuid]) {
@@ -18,7 +18,7 @@
<script src="scripts/4bea0a84.bower_components.js"></script>

<script src="scripts/config.js"></script>
<script src="scripts/ff270700.main.js"></script>
<script src="scripts/b295aeaa.main.js"></script>

<script src="scripts/ce98c266.vendor.js"></script>

Large diffs are not rendered by default.

This file was deleted.

No commit comments for this range

You can’t perform that action at this time.