Refactor AppStore variables

Merged but not yet deployed on a dev-appstore-N site.

Pull request submitted
https://bitbucket.org/lorainelab/appstore/pull-requests/113/igbf-1996-bug-fix/diff

OK!

Riddhi Jagdish Patil - please submit PR to lorainelab/appstore's master branch (previously the PR was to master branch on fork)

Re-based IGBF-1996-Bug-Fix with master and resolved merge conflicts

Riddhi Jagdish Patil The branch is many commits behind master, and I have a vague memory of merging a branch from Noor Zahara that touched the same code.

To check for potential conflicts, I added your repo as a remote to my local appstore clone and did the following:

local aloraine$ git remote -v
appstore_riddhi git@bitbucket.org:rpatil14/appstore_riddhi.git (fetch)
appstore_riddhi git@bitbucket.org:rpatil14/appstore_riddhi.git (push)
origin git@bitbucket.org:aloraine/appstore.git (fetch)
origin git@bitbucket.org:aloraine/appstore.git (push)
local aloraine$ git fetch appstore_riddhi
remote: Counting objects: 22, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 22 (delta 15), reused 0 (delta 0)
Unpacking objects: 100% (22/22), done.
From bitbucket.org:rpatil14/appstore_riddhi

• [new branch] IGBF-1984 -> appstore_riddhi/IGBF-1984
• [new branch] IGBF-1989 -> appstore_riddhi/IGBF-1989
• [new branch] IGBF-1996-Bug-Fix -> appstore_riddhi/IGBF-1996-Bug-Fix
• [new branch] IGBF-2002-app-description -> appstore_riddhi/IGBF-2002-app-description
• [new branch] dockernize -> appstore_riddhi/dockernize
• [new branch] master -> appstore_riddhi/master
• [new branch] master-old -> appstore_riddhi/master-old
• [new branch] wip -> appstore_riddhi/wip

local aloraine$ git checkout IGBF-1996-Bug-Fix
Branch 'IGBF-1996-Bug-Fix' set up to track remote branch 'IGBF-1996-Bug-Fix' from 'appstore_riddhi'.

Then I tried to merge with latest master branch (from "origin" – my fork, sync'd to lorainelab appstore team repository):

local aloraine$ git merge --no-commit --no-ff origin master
Auto-merging static/apps/js/app_page.js
CONFLICT (content): Merge conflict in static/apps/js/app_page.js
Auto-merging obr/repogen.py
Auto-merging apps/templates/app_page_edit.html
Auto-merging apps/templates/app_page.html
Automatic merge failed; fix conflicts and then commit the result.

For the next steps, could you synchronize your fork with the latest master, rebase IGBF-1996-Bug-Fix on the last master, and resolve the conflict?

Probably the conflict is the "xhr" bug fix now corrected in master and also in your branch.

Riddhi Jagdish Patil Checking it now. (I recall some of these commits may already be merged but need to check to be sure.)

[~aloraine], Can we merge this https://bitbucket.org/rpatil14/appstore_riddhi/branch/IGBF-1996-Bug-Fix

Features working as expected:

Features tested and working:
1) Uploading logo
2) Uploading screenshots
3) Updating the short title
4) Updating the description
5) Tested app submission
6) Tested app submission cancellation
7) Tested redirection of obr/releases/repository.xml
8) Tested redirection of obr/pending_releases/repository.xml
9) Tested adding of license url, website url, citation, tutorials url
10) Tested deletion of all ratings by clicking delete ratings button

Bugs resolved:
1) Fixed issue with repository file creation
2) Fixed Install button not showing for IGB
3) Changed cursor to Hand pointer for Editor Actions
4) Renamed edit page options to be more meaningful

The bug fixes are present in - https://bitbucket.org/rpatil14/appstore_riddhi/branch/IGBF-1996-Bug-Fix branch

Question about Author:
Added author and saved it, not sure where this information can be seen on the UI once it is saved