From e6858d7203bd36923f6251968bede6f4b271bf84 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Feb 2010 08:44:15 -0500
Subject: modify group actions so they use Local_group to look up by nickname

---
 actions/editgroup.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'actions/editgroup.php')

diff --git a/actions/editgroup.php b/actions/editgroup.php
index ad0b6e185..bbbb7a0f4 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -86,10 +86,14 @@ class EditgroupAction extends GroupDesignAction
         }
 
         $groupid = $this->trimmed('groupid');
+
         if ($groupid) {
             $this->group = User_group::staticGet('id', $groupid);
         } else {
-            $this->group = User_group::staticGet('nickname', $nickname);
+            $local = Local_group::staticGet('nickname', $nickname);
+            if ($local) {
+                $this->group = User_group::staticGet('id', $local->group_id);
+            }
         }
 
         if (!$this->group) {
@@ -259,6 +263,12 @@ class EditgroupAction extends GroupDesignAction
             $this->serverError(_('Could not create aliases.'));
         }
 
+        if ($nickname != $orig->nickname) {
+            common_log(LOG_INFO, "Saving local group info.");
+            $local = Local_group::staticGet('group_id', $this->group->id);
+            $local->setNickname($nickname);
+        }
+
         $this->group->query('COMMIT');
 
         if ($this->group->nickname != $orig->nickname) {
@@ -272,7 +282,7 @@ class EditgroupAction extends GroupDesignAction
 
     function nicknameExists($nickname)
     {
-        $group = User_group::staticGet('nickname', $nickname);
+        $group = Local_group::staticGet('nickname', $nickname);
 
         if (!empty($group) &&
             $group->id != $this->group->id) {
-- 
cgit v1.2.3-54-g00ecf


From d53b4b9b8411f8edbbeba57bdbc3b2e06c41c18e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Feb 2010 12:05:22 -0500
Subject: save mainpage element for groups

---
 actions/editgroup.php  | 1 +
 actions/newgroup.php   | 3 +++
 classes/User_group.php | 1 +
 3 files changed, 5 insertions(+)

(limited to 'actions/editgroup.php')

diff --git a/actions/editgroup.php b/actions/editgroup.php
index bbbb7a0f4..d486db0c0 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -249,6 +249,7 @@ class EditgroupAction extends GroupDesignAction
         $this->group->homepage    = $homepage;
         $this->group->description = $description;
         $this->group->location    = $location;
+        $this->group->mainpage    = common_local_url('showgroup', array('nickname' => $nickname));
 
         $result = $this->group->update($orig);
 
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 6bb3eca76..75bc293ec 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -180,6 +180,8 @@ class NewgroupAction extends Action
             }
         }
 
+        $mainpage = common_local_url('showgroup', array('nickname' => $nickname));
+
         $cur = common_current_user();
 
         // Checked in prepare() above
@@ -193,6 +195,7 @@ class NewgroupAction extends Action
                                             'location' => $location,
                                             'aliases'  => $aliases,
                                             'userid'   => $cur->id,
+                                            'mainpage' => $mainpage,
                                             'local'    => true));
 
         common_redirect($group->homeUrl(), 303);
diff --git a/classes/User_group.php b/classes/User_group.php
index a81eb8ce0..0592c56f8 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -421,6 +421,7 @@ class User_group extends Memcached_DataObject
         $group->description = $description;
         $group->location    = $location;
         $group->uri         = $uri;
+        $group->mainpage    = $mainpage;
         $group->created     = common_sql_now();
 
         $result = $group->insert();
-- 
cgit v1.2.3-54-g00ecf


From 6ae39da198e391f57a901e24a2561e76afe11613 Mon Sep 17 00:00:00 2001
From: Michele <macno@macno.org>
Date: Fri, 26 Feb 2010 11:35:55 +0100
Subject: Fixed object name

---
 actions/editgroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions/editgroup.php')

diff --git a/actions/editgroup.php b/actions/editgroup.php
index d486db0c0..4b596cade 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -286,7 +286,7 @@ class EditgroupAction extends GroupDesignAction
         $group = Local_group::staticGet('nickname', $nickname);
 
         if (!empty($group) &&
-            $group->id != $this->group->id) {
+            $group->group_id != $this->group->id) {
             return true;
         }
 
-- 
cgit v1.2.3-54-g00ecf