Removed unused content_fors from user_sessions/new which are not used in converge-ui any more
BZ 857223 - Removes a malformed haml comment from layout

This was displaying the haml as an HTML comment, which was
kind of silly. Since it wasn't used, I'm just removing it.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=857223
BZ857491, added unauthenticated.js.erb to spec.in, fixed login screen warning icon
BZ 857489 - Remove unneeded My Account button in Header

Signed-off-by: Tzu-Mainn Chen <tzumainn@redhat.com>
BZ 857489 - Updated test to look for user.name rather than "My Account"

Signed-off-by: Tzu-Mainn Chen <tzumainn@redhat.com>
Merge pull request #61 from jtomasek/BZ857491_add_unauthenticated_to_spec_in

BZ857491, added unauthenticated.js.erb to spec.in, fixed login screen wa...
BZ#857427 - Wrong status displayed for "conductor-delayed_job" service on rhel

https://bugzilla.redhat.com/show_bug.cgi?id=857427

The delayed_job init script starts two daemons, each with their own
pid file.  The status option of the init script needs to verify the
status of each daemon.  Previously it was assuming only one daemon and
was looking for the wrong pidfile altogether.
Merge pull request #62 from jeckersb/bz857427

BZ#857427 - Wrong status displayed for "conductor-delayed_job" service on rhel works for eggs.
BZ857500 Removed overriding body background declaration

This patch also hides the #header:after block which is redundant
Merge pull request #63 from jtomasek/BZ857500_background

BZ857500 Removed overriding body background declaration
BZ858234 check if deployable is nil before trying to generate deployment xml

Signed-off-by: Matt Wagner <matt.wagner@redhat.com>
BZ857434 - since source_type is used to figure out table names, ensure that source_type is always equal to deployment or instance

Signed-off-by: Matt Wagner <matt.wagner@redhat.com>
BZ857009 Multiple pools deletion error message fix

https://bugzilla.redhat.com/show_bug.cgi?id=857009
BZ857042 only validate pool_must_be_enabled on create

Signed-off-by: Matt Wagner <matt.wagner@redhat.com>
Bug 858253: group members search

https://bugzilla.redhat.com/show_bug.cgi?id=858253

Group members search wasn't working -- the UI elements were there but we weren't filtering and weren't providing the necessary controller action.
Merge pull request #68 from jtomasek/BZ857009_multiple_pools_deletion_error

BZ857009 Multiple pools deletion error message fix
bug 858782: don't rely on User object hooks to create entities

https://bugzilla.redhat.com/show_bug.cgi?id=858782

Now that we've changed user login to username, the entities migration
is failing -- since it's using the User model save hook to
set entities, but the model now references the new 'username'
field, which only exists after a later migration.

This patch pulls the save hook logic into the migration itself and
uses the attributes as they existed at the time of this migration.
BZ 809787 - Fixes untranslated table header

For some reason this table header was never updated to use
strings from en.yml, or even uppercase strings.

Because it's after string freeze, I had to be slightly creative
in fitting things in, so I left a comment suggesting that the
keys I used might need cleanup later.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=809787
but is equally as useful upstream.

Signed-off-by: Tzu-Mainn Chen <tzumainn@redhat.com>
BZ 837027 - Pool to Cloud Resource Zone fix

We were referencing a non-existent string, causing "Pool" to be
displayed as a missing translation -- thus it didn't get converted
to product names.

The way we are joining these two strings rather than using a new
string is broken but out of scope. I entered #858827 for that.

This resolves https://bugzilla.redhat.com/show_bug.cgi?id=837027

Signed-off-by: Tzu-Mainn Chen <tzumainn@redhat.com>
Older dc-core (0.5.x version in RHEL) returns 'pending' state when an instances
is shutting down. Conductor compared last_pending time with last_running time
to distinguish newely created instances. But this comparison doesn't work properly
with the bug in dc-core.

Instead of last_pending time conductor now checks if 'create' was last queued
instance's task.

https://bugzilla.redhat.com/show_bug.cgi?id=857542

Signed-off-by: Tzu-Mainn Chen <tzumainn@redhat.com>