From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 25 Oct 2013 16:01:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: 0.2-6~6^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c8a634162f3271018102e75a3934c5db5e48f59;hp=-c;p=unfold.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

0c8a634162f3271018102e75a3934c5db5e48f59
diff --combined manifold/manifoldapi.py
index 042e127e,e7c6ce90..35fd3d74
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@@ -20,13 -20,13 +20,13 @@@ class ManifoldAPI
  
      def __init__(self, auth=None, cainfo=None):
          
-         config = Config()
          self.auth = auth
          self.cainfo = cainfo
          self.errors = []
          self.trace = []
          self.calls = {}
          self.multicall = False
+         config = Config()
          self.url = config.manifold_url()
          self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
  
@@@ -87,10 -87,6 +87,10 @@@ def _execute_query(request, query, mani
      result = manifold_api.forward(query.to_dict())
      if result['code'] == 2:
          raise Exception, 'Error running query: %r' % result
 +    
 +    if result['code'] == 1:
 +        print "WARNING" 
 +        print result['description']
  
      # XXX Handle errors
      #Error running query: {'origin': [0, 'XMLRPCAPI'], 'code': 2, 'description': 'No such session: No row was found for one()', 'traceback': 'Traceback (most recent call last):\n  File "/usr/local/lib/python2.7/dist-packages/manifold/core/xmlrpc_api.py", line 68, in xmlrpc_forward\n    user = Auth(auth).check()\n  File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 245, in check\n    return self.auth_method.check()\n  File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 95, in check\n    raise AuthenticationFailure, "No such session: %s" % e\nAuthenticationFailure: No such session: No row was found for one()\n', 'type': 2, 'ts': None, 'value': None}
diff --combined myslice/myslice.ini.localhost
index c22836e9,325191d0..c22836e9
--- a/myslice/myslice.ini.localhost
+++ b/myslice/myslice.ini.localhost
@@@ -1,4 -1,4 +1,4 @@@
  [manifold]
  url = http://localhost:7080
  admin_user = admin
 -admin_password = demo
 +admin_password = admin
diff --combined portal/templates/registration_view.html
index d8abb5d5,6f709f4f..3d1010c5
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@@ -49,19 -49,6 +49,19 @@@
        </div>
        <div class="col-xs-4"><p class="form-hint">Please select an authority responsible for vetting your account</p></div>
      </div>
 +
 +	<!-- LOGIN
 +	TODO: Login should be suggested from user email or first/last name, and
 +	checked for existence. In addition, the full HRN should be shown to the
 +	user.
 +	-->
 +    <div class="form-group">
 +      <label for="login" class="col-xs-4 control-label">Login</label>
 +      <div class="col-xs-4">
 +	  <input type="text" name="login" size="25" class="form-control" minlength="2" value="{{ login }}" placeholder="Login" required />
 +      </div>
 +      <div class="col-xs-4"><p class="form-hint">Enter your login</p></div>
 +    </div>
      
      <div class="form-group">
        <label for="email" class="col-xs-4 control-label">Email</label>
@@@ -104,9 -91,8 +104,8 @@@
        <div class="col-xs-4"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
      </div>
      <div class="form-group" id="register">
-       <div class="col-xs-offset-4 col-xs-4">
- 	<button class="submit btn btn-default" type="submit">Register</button>
-       </div>
+       <button class="submit btn btn-default col-md-offset-4 col-xs-4" type="submit">Register</button>
+     </div>
      </div>
    </fieldset>
    </form>