← Back to branch summary

~hatch/juju-gui/1130790-create-subapp

« back to all changes in this revision

Viewing changes to app/views/login.js

  • Committer: Benjamin Saller
  • Date: 2013-02-20 15:10:12 UTC
  • mfrom: (390 juju-gui)
  • mto: This revision was merged to the branch mainline in revision 391.
  • Revision ID: bcsaller@gmail.com-20130220151012-e28y6jek95ctubhv
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/views/login.js
83
83
        provider_type: provider_type,
84
84
        error_text: (
85
85
            env.failedAuthentication ? 'Unknown user or password.' : ''),
 
86
        user: env.get('user') || env.defaultUser,
86
87
        help_text: this.get('help_text')
87
88
      }));
88
89
      return this;