Merge branch 'fix/issue-1807' of dlab/hive

from pull-request 1292 * refs/heads/fix/issue-1807: Fix compile error after e7589df Reviewed-by: 이응준 <eungjun.yi@navercorp.com>
naver · Aug 14, 2014 · d9449d0 · d9449d0
2 parents e7589df + e308c07
commit d9449d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/OrganizationApp.java b/app/controllers/OrganizationApp.java
@@ -263,14 +263,14 @@ public static Result leave(String organizationName) {
         ValidationResult result = validateForLeave(organizationName);
 
         if (!result.hasError()) {
-            OrganizationUser.delete(Organization.findByOrganizationName(organizationName).id, UserApp.currentUser().id);
+            OrganizationUser.delete(Organization.findByName(organizationName).id, UserApp.currentUser().id);
         }
 
         return result.getResult();
     }
 
     public static ValidationResult validateForLeave(String organizationName) {
-        Organization organization = Organization.findByOrganizationName(organizationName);
+        Organization organization = Organization.findByName(organizationName);
 
         if (organization == null) {
             return new ValidationResult(notFound(getJsonErrorMsg("organization.member.unknownOrganization")), true);

diff --git a/app/controllers/SearchApp.java b/app/controllers/SearchApp.java
@@ -119,7 +119,7 @@ public static Result searchInAGroup(String organizationName) {
             return badRequest();
         }
 
-        Organization organization = Organization.findByOrganizationName(organizationName);
+        Organization organization = Organization.findByName(organizationName);
         User user = UserApp.currentUser();
         SearchType searchType = SearchType.getValue(searchTypeValue);