Remove idea submission when joining a project

localprojects · Mar 21, 2012 · 476c159 · 476c159
1 parent d4c48ad
commit 476c159
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/controllers/project.py b/controllers/project.py
@@ -173,17 +173,14 @@ def getProjectUser(self, projectId):
 
     def join(self):
         projectId = self.request('project_id')
-        #description = self.request('message')
 
         if (not self.user):
             log.error("*** join submitted w/o logged in user")
             return False
         elif (not projectId):
             log.error("*** join submitted w/o logged project id")
             return False
-        #elif (util.strNullOrEmpty(description)):
-        #    log.error("*** join submitted w/o idea")
-        #    return False
+
         else:
             isJoined = mProject.join(self.db, projectId, self.user.id)
 

diff --git a/static/js/pages/project.js b/static/js/pages/project.js
@@ -138,15 +138,7 @@ app_page.features.push(function(app) {
         user: {
             source_element: tc.jQ('.modal-content.introduce-yourself'),
             init: function(modal, event_target, callback) {
-            	/*
-                var modal_merlin = new tc.merlin(app, tc.app.merlin_join_modal(modal, event_target, callback));
-                
-                if(tc.jQ.isFunction(callback)){
-                    callback(modal);
-                }
-                */
-               tc.util.log('WTF')
-                tc.jQ.ajax({
+            	tc.jQ.ajax({
                     type: 'POST',
                     url: '/project/join',
                     data: {