Changeset 1623
- Timestamp:
- Mar 11, 2011, 12:40:10 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/domain/dbnp/studycapturing/Study.groovy
r1621 r1623 456 456 // Administrators are allowed to read everything 457 457 if (user.hasAdminRights()) { 458 return c.list {458 return c.listDistinct { 459 459 maxResults(max) 460 460 order("title", "asc") … … 463 463 } 464 464 465 return c.list {465 return c.listDistinct { 466 466 maxResults(max) 467 467 order("title", "asc") … … 483 483 // Administrators are allowed to read everything 484 484 if (user == null) { 485 return c.list {485 return c.listDistinct { 486 486 maxResults(max) 487 487 firstResult(offset) … … 493 493 }.unique() 494 494 } else if (user.hasAdminRights()) { 495 return c.list {495 return c.listDistinct { 496 496 maxResults(max) 497 497 firstResult(offset) … … 499 499 }.unique() 500 500 } else { 501 return c.list {501 return c.listDistinct { 502 502 maxResults(max) 503 503 firstResult(offset) … … 529 529 if (user == null) { 530 530 // regular user 531 return c.list {531 return c.listDistinct { 532 532 or { 533 533 ilike("title", "%${query}%") … … 541 541 } else if (user.hasAdminRights()) { 542 542 // admin can search everything 543 return c.list {543 return c.listDistinct { 544 544 or { 545 545 ilike("title", "%${query}%") … … 548 548 } 549 549 } else { 550 return c.list {550 return c.listDistinct { 551 551 or { 552 552 ilike("title", "%${query}%") … … 579 579 public static countPublicStudies(boolean published) { 580 580 def c = Study.createCriteria() 581 return c.count {581 return (c.listDistinct { 582 582 and { 583 583 eq("published", published) 584 584 eq("publicstudy", true) 585 585 } 586 } 586 }).size() 587 587 } 588 588 … … 594 594 public static countPrivateStudies(boolean published) { 595 595 def c = Study.createCriteria() 596 return c.count {596 return (c.listDistinct { 597 597 and { 598 598 eq("publicstudy", false) … … 602 602 eq("publicstudy", true) 603 603 } 604 } 604 }).size() 605 605 } 606 606 … … 623 623 return Study.count() 624 624 } else { 625 return c.count {625 return (c.listDistinct { 626 626 or { 627 627 eq("owner", user) … … 636 636 } 637 637 } 638 } 638 }).size() 639 639 } 640 640 } … … 652 652 return Study.count() 653 653 } else { 654 return c.count {654 return (c.listDistinct { 655 655 or { 656 656 eq("owner", user) … … 659 659 } 660 660 } 661 } 661 }).size() 662 662 } 663 663 }
Note: See TracChangeset
for help on using the changeset viewer.