You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/10 18:33:52 UTC
[1/2] incubator-usergrid git commit: [USERGRID-640] persist entities
specified when adding a collection
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 95a104c7f -> 5f18b153a
[USERGRID-640] persist entities specified when adding a collection
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e5ff7178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e5ff7178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e5ff7178
Branch: refs/heads/two-dot-o-dev
Commit: e5ff7178ea4b88f495fb555c96b236da447d7a5b
Parents: b637535
Author: ryan bridges <ry...@apache.org>
Authored: Tue May 19 11:49:23 2015 -0400
Committer: ryan bridges <ry...@apache.org>
Committed: Tue May 19 11:49:23 2015 -0400
----------------------------------------------------------------------
portal/js/global/ug-service.js | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5ff7178/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index 7bc9d7c..46e0dc7 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -272,16 +272,14 @@ AppServices.Services.factory('ug', function(configuration, $rootScope, utility,
return $rootScope.$broadcast('alert', 'error',
'error creating collection');
}
- entity.destroy(function() {
- self.getTopCollections(function(err, collections) {
- if (err) {
- $rootScope.$broadcast('alert', 'error',
- 'error creating collection');
- } else {
- $rootScope.$broadcast('collection-created',
- collections);
- }
- });
+ self.getTopCollections(function(err, collections) {
+ if (err) {
+ $rootScope.$broadcast('alert', 'error',
+ 'error creating collection');
+ } else {
+ $rootScope.$broadcast('collection-created',
+ collections);
+ }
});
});
},
[2/2] incubator-usergrid git commit: Merge branch 'USERGRID-640' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Posted by sf...@apache.org.
Merge branch 'USERGRID-640' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5f18b153
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5f18b153
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5f18b153
Branch: refs/heads/two-dot-o-dev
Commit: 5f18b153ad6191d8622ce4464a8781b8b6256e6a
Parents: 95a104c e5ff717
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 10:33:48 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 10:33:48 2015 -0600
----------------------------------------------------------------------
portal/js/global/ug-service.js | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------