Fixing bug where the modified markup breaks adding groups.

Closes photo#407
Ap0ught-Old · Dec 30, 2011 · 0cec9c9 · 0cec9c9
1 parent 3d7178f
commit 0cec9c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/html/assets/themes/beisel/javascripts/openphoto-theme-full-min.js b/src/html/assets/themes/beisel/javascripts/openphoto-theme-full-min.js
diff --git a/src/html/assets/themes/beisel/javascripts/openphoto-theme.js b/src/html/assets/themes/beisel/javascripts/openphoto-theme.js
@@ -153,7 +153,7 @@ var opTheme = (function() {
       groupPost: function(ev) {
         ev.preventDefault();
         var el = $(ev.target),
-            form = el.parent(),
+            form = el.parent().parent(),
             url = form.attr('action')+'.json',
             isCreate = (url.search('create') > -1);
         OP.Util.makeRequest(url, form.serializeArray(), function(response) {

diff --git a/src/libraries/controllers/UserController.php b/src/libraries/controllers/UserController.php
@@ -63,7 +63,7 @@ public static function settings()
     if(!empty($mobilePassphrase))
       $mobilePassphrase['minutes'] = ceil(($mobilePassphrase['expiresAt']-time())/60);
     $template = sprintf('%s/settings.php', getConfig()->get('paths')->templates);
-    $body = getTemplate()->get($template, array('plugins' => $plugins['result'], 'credentials' => $credentials['result'], 'webhooks' => $webhooks['result'], 'groups' => $groups['result'], 'mobilePassphrase' => $mobilePassphrase));
+    $body = getTemplate()->get($template, array('crumb' => getSession()->get('crumb'), 'plugins' => $plugins['result'], 'credentials' => $credentials['result'], 'webhooks' => $webhooks['result'], 'groups' => $groups['result'], 'mobilePassphrase' => $mobilePassphrase));
     getTheme()->display('template.php', array('body' => $body, 'page' => 'settings'));
   }
 }