Skip to content

Fix project level sharing#2513

Merged
cpirich merged 8 commits into
stagingfrom
fix_project_level_sharing
May 27, 2015
Merged

Fix project level sharing#2513
cpirich merged 8 commits into
stagingfrom
fix_project_level_sharing

Conversation

@cpirich

@cpirich cpirich commented May 22, 2015

Copy link
Copy Markdown
Contributor
  • Pass through dashboard's browser.mobile? check as appOptions.isMobile
  • Improve handling of viewing project URLs for 3 cases:
  1. With a hash but without /edit, as the owner (set hideSource and share and noPadding (when on mobile) so you see the same thing as non-owners
  2. With a hash but without /edit, as a non-owner (do the same thing as Employee Engagement basics: Create code.org/company-profiles/* landing page #1)
  3. With a hash and /edit, as a non-owner (don't set hideSource or noPadding)

Still remaining to do:

  • Re-implement addToHome() for iOS in share mode

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed to avoid a circular dependency. In order for LevelsHelperTests to test LevelsHelper, LevelsHelper needs to include ApplicationHelper to access the browser method. Once that happens, we can't have ApplicationHelper include LevelsHelper. I discussed this with Laurel yesterday and arrived at this solution.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that makes sense, thanks for the explanation!

@joshlory

Copy link
Copy Markdown
Contributor

Pulled the change & built to test locally. Looks good!

cpirich added a commit that referenced this pull request May 27, 2015
@cpirich cpirich merged commit 817bc2c into staging May 27, 2015
@cpirich cpirich deleted the fix_project_level_sharing branch May 27, 2015 20:13
deploy-code-org added a commit that referenced this pull request May 27, 2015
commit 817bc2c
Merge: abb6ca9 aef144d
Author: Chris Pirich <chris@code.org>
Date:   Wed May 27 13:12:59 2015 -0700

    Merge pull request #2513 from code-dot-org/fix_project_level_sharing

    Fix project level sharing

commit abb6ca9
Author: Continuous Integration <dev@code.org>
Date:   Wed May 27 20:10:17 2015 +0000

    Automatically built.

    commit 1d7991e
    Author: Josh Lory <josh.lory@code.org>
    Date:   Wed May 27 13:01:53 2015 -0700

        Only include color scss in applab, not common scss

commit 1d7991e
Author: Josh Lory <josh.lory@code.org>
Date:   Wed May 27 13:01:53 2015 -0700

    Only include color scss in applab, not common scss

commit 6761a91
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Wed May 27 12:34:11 2015 -0700

    Accommodating multiple cohorts on workshops page.

commit 0cfeed2
Author: Continuous Integration <dev@code.org>
Date:   Wed May 27 19:30:15 2015 +0000

    Automatically built.

    commit e271b91
    Merge: c7db2db 5d20db3
    Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
    Date:   Wed May 27 12:22:45 2015 -0700

        Merge pull request #2534 from code-dot-org/netsim_interrouter_messaging

        NetSim: Interrouter messaging

    commit c7db2db
    Author: CaptainStack <CaptainStack@outlook.com>
    Date:   Wed May 27 12:13:38 2015 -0700

        Switching links to use ng-href

    commit 5b6ba92
    Author: Continuous Integration <dev@code.org>
    Date:   Wed May 27 18:46:19 2015 +0000

        Automatically built.

        commit 6974e9c
        Author: cpirich <chris@code.org>
        Date:   Wed May 27 11:37:12 2015 -0700

            fix expansion block bug due to block/function scope

    commit 6974e9c
    Author: cpirich <chris@code.org>
    Date:   Wed May 27 11:37:12 2015 -0700

        fix expansion block bug due to block/function scope

    commit f9f249b
    Author: Continuous Integration <dev@code.org>
    Date:   Wed May 27 18:28:19 2015 +0000

        Automatically built.

        commit e592e8a
        Author: Brad Buchanan <brad@code.org>
        Date:   Wed May 27 11:20:06 2015 -0700

            Fail more gracefully when unable to create client node.

        commit a3201ee
        Author: Brad Buchanan <brad@code.org>
        Date:   Wed May 27 11:19:40 2015 -0700

            Fix NetSim UI Tests running on localhost; select correct channels API public key under localhost-studio.code.org rewrite

    commit e592e8a
    Author: Brad Buchanan <brad@code.org>
    Date:   Wed May 27 11:20:06 2015 -0700

        Fail more gracefully when unable to create client node.

commit e271b91
Merge: c7db2db 5d20db3
Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
Date:   Wed May 27 12:22:45 2015 -0700

    Merge pull request #2534 from code-dot-org/netsim_interrouter_messaging

    NetSim: Interrouter messaging

commit c7db2db
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Wed May 27 12:13:38 2015 -0700

    Switching links to use ng-href

commit 5b6ba92
Author: Continuous Integration <dev@code.org>
Date:   Wed May 27 18:46:19 2015 +0000

    Automatically built.

    commit 6974e9c
    Author: cpirich <chris@code.org>
    Date:   Wed May 27 11:37:12 2015 -0700

        fix expansion block bug due to block/function scope

commit 6974e9c
Author: cpirich <chris@code.org>
Date:   Wed May 27 11:37:12 2015 -0700

    fix expansion block bug due to block/function scope
deploy-code-org added a commit that referenced this pull request May 27, 2015
commit 9e3421a
Merge: 57a9f8e c5b734d
Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
Date:   Wed May 27 13:23:02 2015 -0700

    Merge pull request #2539 from code-dot-org/netsim_router_address_wrap

    Wrap router addresses within addressable space.

commit c5b734d
Author: Brad Buchanan <brad@code.org>
Date:   Wed May 27 13:22:41 2015 -0700

    Test getRouterNumber() directly

commit 57a9f8e
Author: Continuous Integration <dev@code.org>
Date:   Wed May 27 20:13:44 2015 +0000

    Automatically built.

    commit 817bc2c
    Merge: abb6ca9 aef144d
    Author: Chris Pirich <chris@code.org>
    Date:   Wed May 27 13:12:59 2015 -0700

        Merge pull request #2513 from code-dot-org/fix_project_level_sharing

        Fix project level sharing

    commit abb6ca9
    Author: Continuous Integration <dev@code.org>
    Date:   Wed May 27 20:10:17 2015 +0000

        Automatically built.

        commit 1d7991e
        Author: Josh Lory <josh.lory@code.org>
        Date:   Wed May 27 13:01:53 2015 -0700

            Only include color scss in applab, not common scss

    commit 1d7991e
    Author: Josh Lory <josh.lory@code.org>
    Date:   Wed May 27 13:01:53 2015 -0700

        Only include color scss in applab, not common scss

    commit 6761a91
    Author: CaptainStack <CaptainStack@outlook.com>
    Date:   Wed May 27 12:34:11 2015 -0700

        Accommodating multiple cohorts on workshops page.

    commit 0cfeed2
    Author: Continuous Integration <dev@code.org>
    Date:   Wed May 27 19:30:15 2015 +0000

        Automatically built.

        commit e271b91
        Merge: c7db2db 5d20db3
        Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
        Date:   Wed May 27 12:22:45 2015 -0700

            Merge pull request #2534 from code-dot-org/netsim_interrouter_messaging

            NetSim: Interrouter messaging

        commit c7db2db
        Author: CaptainStack <CaptainStack@outlook.com>
        Date:   Wed May 27 12:13:38 2015 -0700

            Switching links to use ng-href

        commit 5b6ba92
        Author: Continuous Integration <dev@code.org>
        Date:   Wed May 27 18:46:19 2015 +0000

            Automatically built.

            commit 6974e9c
            Author: cpirich <chris@code.org>
            Date:   Wed May 27 11:37:12 2015 -0700

                fix expansion block bug due to block/function scope

        commit 6974e9c
        Author: cpirich <chris@code.org>
        Date:   Wed May 27 11:37:12 2015 -0700

            fix expansion block bug due to block/function scope

        commit f9f249b
        Author: Continuous Integration <dev@code.org>
        Date:   Wed May 27 18:28:19 2015 +0000

            Automatically built.

            commit e592e8a
            Author: Brad Buchanan <brad@code.org>
            Date:   Wed May 27 11:20:06 2015 -0700

                Fail more gracefully when unable to create client node.

            commit a3201ee
            Author: Brad Buchanan <brad@code.org>
            Date:   Wed May 27 11:19:40 2015 -0700

                Fix NetSim UI Tests running on localhost; select correct channels API public key under localhost-studio.code.org rewrite

        commit e592e8a
        Author: Brad Buchanan <brad@code.org>
        Date:   Wed May 27 11:20:06 2015 -0700

            Fail more gracefully when unable to create client node.

    commit e271b91
    Merge: c7db2db 5d20db3
    Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
    Date:   Wed May 27 12:22:45 2015 -0700

        Merge pull request #2534 from code-dot-org/netsim_interrouter_messaging

        NetSim: Interrouter messaging

    commit c7db2db
    Author: CaptainStack <CaptainStack@outlook.com>
    Date:   Wed May 27 12:13:38 2015 -0700

        Switching links to use ng-href

    commit 5b6ba92
    Author: Continuous Integration <dev@code.org>
    Date:   Wed May 27 18:46:19 2015 +0000

        Automatically built.

        commit 6974e9c
        Author: cpirich <chris@code.org>
        Date:   Wed May 27 11:37:12 2015 -0700

            fix expansion block bug due to block/function scope

    commit 6974e9c
    Author: cpirich <chris@code.org>
    Date:   Wed May 27 11:37:12 2015 -0700

        fix expansion block bug due to block/function scope
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants